ARTEMIS-5534 use Objects.requireNonNullElse() where sensible

artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/perf/PerfClientCommand.java

@@ -19,6 +19,7 @@
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Queue;
 import java.util.concurrent.Executor;
 import java.util.concurrent.LinkedTransferQueue;
@@ -95,8 +96,8 @@ public class PerfClientCommand extends PerfCommand {
 
    @Override
    protected void onExecuteBenchmark(final ConnectionFactory producerConnectionFactory, final Destination[] jmsDestinations, final ActionContext context) throws Exception {
-      final ConnectionProtocol listenerProtocol = this.consumerProtocol != null ? this.consumerProtocol : protocol;
-      final String listenerUrl = this.consumerUrl != null ? this.consumerUrl : brokerURL;
+      final ConnectionProtocol listenerProtocol = Objects.requireNonNullElse(this.consumerProtocol, protocol);
+      final String listenerUrl = Objects.requireNonNullElse(this.consumerUrl, brokerURL);
       final ConnectionFactory consumerConnectionFactory = createConnectionFactory(listenerUrl, user, password, null, listenerProtocol);
       if (consumerConnections == 0) {
          if (sharedSubscription > 0) {

artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java

@@ -22,6 +22,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -305,7 +306,7 @@ private static void printPages(DescribeJournal describeJournal,
                            out.print("pg=" + pgid + ", msg=" + msgID + ",pgTX=" + msg.getTransactionID() + ", msg=" + msg.getMessage().getClass().getSimpleName() + "(safe data)");
                         }
                      } else {
-                        out.print("pg=" + pgid + ", msg=" + msgID + ",pgTX=" + msg.getTransactionID() + ",userMessageID=" + (msg.getMessage().getUserID() != null ? msg.getMessage().getUserID() : "") + ", msg=" + msg.getMessage());
+                        out.print("pg=" + pgid + ", msg=" + msgID + ",pgTX=" + msg.getTransactionID() + ",userMessageID=" + Objects.requireNonNullElse(msg.getMessage().getUserID(), "") + ", msg=" + msg.getMessage());
                      }
                      out.print(",Queues = ");
                      long[] q = msg.getQueueIDs();

artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/QueueConfiguration.java

@@ -336,7 +336,7 @@ public QueueConfiguration setId(Long id) {
     * {@return the name of the address; if the address is {@code null} then return the value of {@link #getName()}}
     */
    public SimpleString getAddress() {
-      return address == null ? getName() : address;
+      return Objects.requireNonNullElse(address, getName());
    }
 
    public boolean isAddressNull() {
@@ -445,7 +445,7 @@ public QueueConfiguration setFilterString(String filterString) {
     * defaults to {@code true}
     */
    public Boolean isDurable() {
-      return durable == null ? true : durable;
+      return Objects.requireNonNullElse(durable, true);
    }
 
    public QueueConfiguration setDurable(Boolean durable) {
@@ -641,7 +641,7 @@ public QueueConfiguration setRingSize(Long ringSize) {
     * defaults to {@code false}
     */
    public Boolean isConfigurationManaged() {
-      return configurationManaged == null ? false : configurationManaged;
+      return Objects.requireNonNullElse(configurationManaged, false);
    }
 
    public QueueConfiguration setConfigurationManaged(Boolean configurationManaged) {
@@ -653,7 +653,7 @@ public QueueConfiguration setConfigurationManaged(Boolean configurationManaged)
     * defaults to {@code false}
     */
    public Boolean isTemporary() {
-      return temporary == null ? false : temporary;
+      return Objects.requireNonNullElse(temporary, false);
    }
 
    public QueueConfiguration setTemporary(Boolean temporary) {
@@ -674,7 +674,7 @@ public QueueConfiguration setAutoCreateAddress(Boolean autoCreateAddress) {
     * defaults to {@code false}
     */
    public Boolean isInternal() {
-      return internal == null ? false : internal;
+      return Objects.requireNonNullElse(internal, false);
    }
 
    public QueueConfiguration setInternal(Boolean internal) {
@@ -686,7 +686,7 @@ public QueueConfiguration setInternal(Boolean internal) {
     * defaults to {@code false}
     */
    public Boolean isTransient() {
-      return _transient == null ? false : _transient;
+      return Objects.requireNonNullElse(_transient, false);
    }
 
    public QueueConfiguration setTransient(Boolean _transient) {
@@ -698,7 +698,7 @@ public QueueConfiguration setTransient(Boolean _transient) {
     * defaults to {@code false}
     */
    public Boolean isAutoCreated() {
-      return autoCreated == null ? false : autoCreated;
+      return Objects.requireNonNullElse(autoCreated, false);
    }
 
    public QueueConfiguration setAutoCreated(Boolean autoCreated) {
@@ -712,7 +712,7 @@ public QueueConfiguration setAutoCreated(Boolean autoCreated) {
     * defaults to {@code false}
     */
    public Boolean isFqqn() {
-      return fqqn == null ? Boolean.FALSE : fqqn;
+      return Objects.requireNonNullElse(fqqn, Boolean.FALSE);
    }
 
    /**

artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java

@@ -29,6 +29,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -86,7 +87,7 @@ static String getCaller(Subject subject, String remoteAddress) {
       String user = "anonymous";
       String roles = "";
       List<String> principalRoles = new ArrayList<>();
-      String url = remoteAddress == null ? (AuditLogger.remoteAddress.get() == null ? "@unknown" : AuditLogger.remoteAddress.get()) : formatRemoteAddress(remoteAddress);
+      String url = remoteAddress == null ? Objects.requireNonNullElse(AuditLogger.remoteAddress.get(), "@unknown") : formatRemoteAddress(remoteAddress);
       if (subject != null) {
          Set<Principal> principals = subject.getPrincipals();
          for (Principal principal : principals) {

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java

@@ -18,6 +18,7 @@
 
 import java.io.InputStream;
 import java.util.Map;
+import java.util.Objects;
 
 import io.netty.buffer.ByteBuf;
 import org.apache.activemq.artemis.core.message.LargeBodyReader;
@@ -106,7 +107,7 @@ default Map<String, Object> toMap(int valueSizeLimit) {
          map.put("userID", "ID:" + userID.toString());
       }
 
-      map.put("address", getAddress() == null ? "" : getAddress());
+      map.put("address", Objects.requireNonNullElse(getAddress(), ""));
       map.put("type", getType());
       map.put("durable", isDurable());
       map.put("expiration", getExpiration());

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java

@@ -21,6 +21,7 @@
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Predicate;
 
@@ -824,7 +825,7 @@ default Map<String, Object> toMap(int valueSizeLimit) {
          map.put("userID", "ID:" + userID.toString());
       }
 
-      map.put("address", getAddress() == null ? "" : getAddress());
+      map.put("address", Objects.requireNonNullElse(getAddress(), ""));
       map.put("durable", isDurable());
       map.put("expiration", getExpiration());
       map.put("timestamp", getTimestamp());

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientMessageImpl.java

@@ -20,6 +20,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
+import java.util.Objects;
 
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException;
@@ -178,7 +179,7 @@ public int getBodySize() {
 
    @Override
    public String toString() {
-      return getClass().getSimpleName() + "[messageID=" + messageID + ", durable=" + durable + ", address=" + getAddress() + ",userID=" + (getUserID() != null ? getUserID() : "null") + ",properties=" + getProperties().toString() + "]";
+      return getClass().getSimpleName() + "[messageID=" + messageID + ", durable=" + durable + ", address=" + getAddress() + ",userID=" + Objects.requireNonNullElse(getUserID(), "null") + ", properties=" + getProperties().toString() + "]";
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java

@@ -336,7 +336,7 @@ private ServerLocatorImpl(final Topology topology,
                              final TransportConfiguration[] transportConfigs) {
       traceException.fillInStackTrace();
 
-      this.topology = topology == null ? new Topology(this) : topology;
+      this.topology = Objects.requireNonNullElseGet(topology, () -> new Topology(this));
 
       this.ha = useHA;
 
@@ -1585,12 +1585,12 @@ public String toString() {
       if (identity != null) {
          return "ServerLocatorImpl (identity=" + identity +
             ") [initialConnectors=" +
-            Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) +
+            Arrays.toString(Objects.requireNonNullElseGet(initialConnectors, () -> new TransportConfiguration[0])) +
             ", discoveryGroupConfiguration=" +
             discoveryGroupConfiguration +
             "]";
       }
-      return "ServerLocatorImpl [initialConnectors=" + Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) +
+      return "ServerLocatorImpl [initialConnectors=" + Arrays.toString(Objects.requireNonNullElseGet(initialConnectors, () -> new TransportConfiguration[0])) +
          ", discoveryGroupConfiguration=" +
          discoveryGroupConfiguration +
          "]";

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java

@@ -36,6 +36,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.lang.invoke.MethodHandles;
+import java.util.Objects;
 
 public class MessageOpenTypeFactory<M extends Message> {
 
@@ -132,7 +133,7 @@ public Map<String, Object> getFields(M m, int valueSizeLimit, int deliveryCount)
       } else {
          rc.put(CompositeDataConstants.USER_ID, "");
       }
-      rc.put(CompositeDataConstants.ADDRESS, m.getAddress() == null ? "" : m.getAddress());
+      rc.put(CompositeDataConstants.ADDRESS, Objects.requireNonNullElse(m.getAddress(), ""));
       rc.put(CompositeDataConstants.DURABLE, m.isDurable());
       rc.put(CompositeDataConstants.EXPIRATION, m.getExpiration());
       rc.put(CompositeDataConstants.TIMESTAMP, m.getTimestamp());

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java

@@ -25,6 +25,7 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
@@ -999,8 +1000,7 @@ public void resetMetadata(Map<String, String> metaDataToSend) {
    @Override
    public int getDefaultConsumerWindowSize(SessionQueueQueryResponseMessage response) throws ActiveMQException {
       if (response instanceof SessionQueueQueryResponseMessage_V3 v3) {
-         final Integer defaultConsumerWindowSize = v3.getDefaultConsumerWindowSize();
-         return defaultConsumerWindowSize != null ? defaultConsumerWindowSize : ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE;
+         return Objects.requireNonNullElse(v3.getDefaultConsumerWindowSize(), ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE);
       } else {
          return ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE;
       }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/TransportConfigurationUtil.java

@@ -20,6 +20,7 @@
 import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.activemq.artemis.api.core.TransportConfiguration;
 import org.apache.activemq.artemis.api.core.TransportConfigurationHelper;
@@ -86,8 +87,8 @@ public static boolean isSameHost(TransportConfiguration tc1, TransportConfigurat
       if (NettyConnectorFactory.class.getName().equals(tc1.getFactoryClassName())) {
          String host1 = tc1.getParams().get("host") != null ? tc1.getParams().get("host").toString() : TransportConstants.DEFAULT_HOST;
          String host2 = tc2.getParams().get("host") != null ? tc2.getParams().get("host").toString() : TransportConstants.DEFAULT_HOST;
-         String port1 = String.valueOf(tc1.getParams().get("port") != null ? tc1.getParams().get("port") : TransportConstants.DEFAULT_PORT);
-         String port2 = String.valueOf(tc2.getParams().get("port") != null ? tc2.getParams().get("port") : TransportConstants.DEFAULT_PORT);
+         String port1 = String.valueOf(Objects.requireNonNullElse(tc1.getParams().get("port"), TransportConstants.DEFAULT_PORT));
+         String port2 = String.valueOf(Objects.requireNonNullElse(tc2.getParams().get("port"), TransportConstants.DEFAULT_PORT));
          return host1.equals(host2) && port1.equals(port2);
       } else if ("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory".equals(tc1.getFactoryClassName())) {
          String serverId1 = tc1.getParams().get("serverId") != null ? tc1.getParams().get("serverId").toString() : "0";

artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java

@@ -1055,8 +1055,8 @@ private SimpleString createFQQNSubscription(ActiveMQDestination dest,
    }
 
    private ClientConsumer createClientConsumer(ActiveMQDestination destination, SimpleString queueName, SimpleString coreFilterString) throws ActiveMQException {
-      QueueAttributes queueAttributes = destination.getQueueAttributes() == null ? new QueueAttributes() : destination.getQueueAttributes();
-      int priority = queueAttributes.getConsumerPriority() == null ? ActiveMQDefaultConfiguration.getDefaultConsumerPriority() : queueAttributes.getConsumerPriority();
+      QueueAttributes queueAttributes = Objects.requireNonNullElseGet(destination.getQueueAttributes(), () -> new QueueAttributes());
+      int priority = Objects.requireNonNullElse(queueAttributes.getConsumerPriority(), ActiveMQDefaultConfiguration.getDefaultConsumerPriority());
       return session.createConsumer(queueName == null ? destination.getSimpleAddress() : queueName, coreFilterString, priority, false);
    }
 
@@ -1418,19 +1418,19 @@ void checkClosed() throws JMSException {
    }
 
    void createTemporaryQueue(ActiveMQDestination destination, RoutingType routingType, SimpleString queueName, SimpleString filter, ClientSession.AddressQuery addressQuery) throws ActiveMQException {
-      QueueConfiguration queueConfiguration = destination.getQueueConfiguration() == null ? QueueConfiguration.of(queueName) : destination.getQueueConfiguration();
+      QueueConfiguration queueConfiguration = Objects.requireNonNullElse(destination.getQueueConfiguration(), QueueConfiguration.of(queueName));
       AutoCreateUtil.setRequiredQueueConfigurationIfNotSet(queueConfiguration, addressQuery, routingType, filter, false);
       session.createQueue(queueConfiguration.setName(queueName).setAddress(destination.getAddress()).setDurable(false).setTemporary(true));
    }
 
    void createSharedQueue(ActiveMQDestination destination, RoutingType routingType, SimpleString queueName, SimpleString filter, boolean durable, ClientSession.AddressQuery addressQuery) throws ActiveMQException {
-      QueueConfiguration queueConfiguration = destination.getQueueConfiguration() == null ? QueueConfiguration.of(queueName) : destination.getQueueConfiguration();
+      QueueConfiguration queueConfiguration = Objects.requireNonNullElseGet(destination.getQueueConfiguration(), () -> QueueConfiguration.of(queueName));
       AutoCreateUtil.setRequiredQueueConfigurationIfNotSet(queueConfiguration, addressQuery, routingType, filter, durable);
       session.createSharedQueue(queueConfiguration.setName(queueName).setAddress(destination.getAddress()).setDurable(durable));
    }
 
    void createQueue(ActiveMQDestination destination, RoutingType routingType, SimpleString queueName, SimpleString filter, boolean durable, boolean autoCreated, ClientSession.AddressQuery addressQuery) throws ActiveMQException {
-      QueueConfiguration queueConfiguration = destination.getQueueConfiguration() == null ? QueueConfiguration.of(queueName) : destination.getQueueConfiguration();
+      QueueConfiguration queueConfiguration = Objects.requireNonNullElseGet(destination.getQueueConfiguration(), () -> QueueConfiguration.of(queueName));
       AutoCreateUtil.setRequiredQueueConfigurationIfNotSet(queueConfiguration, addressQuery, routingType, filter, durable);
       session.createQueue(queueConfiguration.setName(queueName).setAddress(destination.getAddress()).setAutoCreated(autoCreated).setDurable(durable));
    }

artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnectionManager.java

@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.Executor;
 import java.util.concurrent.locks.Lock;
 import java.util.function.Function;
@@ -103,8 +104,7 @@ private void createBrokerConnection(AMQPBrokerConnectConfiguration configuration
     * @param configurations A list of broker connection configurations after a broker configuration update.
     */
    public void updateConfiguration(List<AMQPBrokerConnectConfiguration> configurations) throws Exception {
-      final List<AMQPBrokerConnectConfiguration> updatedConfigurations =
-         configurations != null ? configurations : Collections.emptyList();
+      final List<AMQPBrokerConnectConfiguration> updatedConfigurations = Objects.requireNonNullElse(configurations, Collections.emptyList());
 
       // We want to shutdown all broker connections before starting any new ones just to ensure
       // we do not have any overlapping connections to the same broker from old to new configurations.

artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeAddressPolicy.java

@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
@@ -62,8 +63,8 @@ public AMQPBridgeAddressPolicy(String policyName,
       this.includeDivertBindings = includeDivertBindings;
       this.useDurableSubscriptions = useDurableSubscriptions;
 
-      this.includes = Collections.unmodifiableCollection(includeAddresses == null ? Collections.emptyList() : includeAddresses);
-      this.excludes = Collections.unmodifiableCollection(excludeAddresses == null ? Collections.emptyList() : excludeAddresses);
+      this.includes = Collections.unmodifiableCollection(Objects.requireNonNullElse(includeAddresses, Collections.emptyList()));
+      this.excludes = Collections.unmodifiableCollection(Objects.requireNonNullElse(excludeAddresses, Collections.emptyList()));
 
       // Create Matchers from configured includes and excludes for use when matching broker resources
       includes.forEach((address) -> includesMatchers.add(new AddressMatcher(address, wildcardConfig)));

artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeQueuePolicy.java

@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
@@ -52,8 +53,8 @@ public AMQPBridgeQueuePolicy(String policyName, Integer priority, int priorityAd
 
       this.priorityAdjustment = priorityAdjustment;
 
-      this.includes = Collections.unmodifiableCollection(includeQueues == null ? Collections.emptyList() : includeQueues);
-      this.excludes = Collections.unmodifiableCollection(excludeQueues == null ? Collections.emptyList() : excludeQueues);
+      this.includes = Collections.unmodifiableCollection(Objects.requireNonNullElse(includeQueues, Collections.emptyList()));
+      this.excludes = Collections.unmodifiableCollection(Objects.requireNonNullElse(excludeQueues, Collections.emptyList()));
 
       // Create Matchers from configured includes and excludes for use when matching broker resources
       includes.forEach((entry) -> includeMatchers.add(new QueueMatcher(entry.getKey(), entry.getValue(), wildcardConfig)));