Stringbuffer cleanup part2 (splitted commits)

activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/sasl/CramMD5Mechanism.java

@@ -16,22 +16,22 @@
  */
 package org.apache.activemq.transport.amqp.client.sasl;
 
-import java.io.UnsupportedEncodingException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import javax.security.sasl.SaslException;
 
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
 /**
  * Implements the SASL PLAIN authentication Mechanism.
  *
  * User name and Password values are sent without being encrypted.
  */
 public class CramMD5Mechanism extends AbstractMechanism {
 
-    private static final String ASCII = "ASCII";
     private static final String HMACMD5 = "HMACMD5";
     private boolean sentResponse;
 
@@ -54,26 +54,25 @@ public byte[] getInitialResponse() {
     public byte[] getChallengeResponse(byte[] challenge) throws SaslException {
         if (!sentResponse && challenge != null && challenge.length != 0) {
             try {
-                SecretKeySpec key = new SecretKeySpec(getPassword().getBytes(ASCII), HMACMD5);
+                SecretKeySpec key = new SecretKeySpec(getPassword().getBytes(US_ASCII), HMACMD5);
                 Mac mac = Mac.getInstance(HMACMD5);
                 mac.init(key);
 
                 byte[] bytes = mac.doFinal(challenge);
 
-                StringBuffer hash = new StringBuffer(getUsername());
+                StringBuilder hash = new StringBuilder((bytes.length * 2) + 64);
+                hash.append(getUsername());
                 hash.append(' ');
-                for (int i = 0; i < bytes.length; i++) {
-                    String hex = Integer.toHexString(0xFF & bytes[i]);
+                for (byte aByte : bytes) {
+                    String hex = Integer.toHexString(0xFF & aByte);
                     if (hex.length() == 1) {
                         hash.append('0');
                     }
                     hash.append(hex);
                 }
 
                 sentResponse = true;
-                return hash.toString().getBytes(ASCII);
-            } catch (UnsupportedEncodingException e) {
-                throw new SaslException("Unable to utilise required encoding", e);
+                return hash.toString().getBytes(US_ASCII);
             } catch (InvalidKeyException e) {
                 throw new SaslException("Unable to utilise key", e);
             } catch (NoSuchAlgorithmException e) {
@@ -86,6 +85,6 @@ public byte[] getChallengeResponse(byte[] challenge) throws SaslException {
 
     @Override
     public boolean isApplicable(String username, String password) {
-        return username != null && username.length() > 0 && password != null && password.length() > 0;
+        return username != null && !username.isEmpty() && password != null && !password.isEmpty();
     }
 }

activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/PropertyUtil.java

@@ -19,13 +19,13 @@
 import java.beans.BeanInfo;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -85,7 +85,7 @@ public static URI replaceQuery(URI uri, String query) throws URISyntaxException
         if (questionMark > 0) {
             schemeSpecificPart = schemeSpecificPart.substring(0, questionMark);
         }
-        if (query != null && query.length() > 0) {
+        if (query != null && !query.isEmpty()) {
             schemeSpecificPart += "?" + query;
         }
         return new URI(uri.getScheme(), schemeSpecificPart, uri.getFragment());
@@ -116,27 +116,23 @@ public static URI eraseQuery(URI uri) throws URISyntaxException {
      *
      * @throws URISyntaxException if the given URI is invalid.
      */
-    public static String createQueryString(Map<String, ? extends Object> options) throws URISyntaxException {
-        try {
-            if (options.size() > 0) {
-                StringBuffer rc = new StringBuffer();
-                boolean first = true;
-                for (Entry<String, ? extends Object> entry : options.entrySet()) {
-                    if (first) {
-                        first = false;
-                    } else {
-                        rc.append("&");
-                    }
-                    rc.append(URLEncoder.encode(entry.getKey(), "UTF-8"));
-                    rc.append("=");
-                    rc.append(URLEncoder.encode((String) entry.getValue(), "UTF-8"));
+    public static String createQueryString(Map<String, ? extends Object> options) {
+        if (!options.isEmpty()) {
+            StringBuilder rc = new StringBuilder();
+            boolean first = true;
+            for (Entry<String, ? extends Object> entry : options.entrySet()) {
+                if (first) {
+                    first = false;
+                } else {
+                    rc.append("&");
                 }
-                return rc.toString();
-            } else {
-                return "";
+                rc.append(URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8));
+                rc.append("=");
+                rc.append(URLEncoder.encode((String) entry.getValue(), StandardCharsets.UTF_8));
             }
-        } catch (UnsupportedEncodingException e) {
-            throw (URISyntaxException) new URISyntaxException(e.toString(), "Invalid encoding").initCause(e);
+            return rc.toString();
+        } else {
+            return "";
         }
     }
 
@@ -196,8 +192,8 @@ public static Map<String, String> parseQuery(String queryString) throws Exceptio
             for (int i = 0; i < parameters.length; i++) {
                 int p = parameters[i].indexOf("=");
                 if (p >= 0) {
-                    String name = URLDecoder.decode(parameters[i].substring(0, p), "UTF-8");
-                    String value = URLDecoder.decode(parameters[i].substring(p + 1), "UTF-8");
+                    String name = URLDecoder.decode(parameters[i].substring(0, p), StandardCharsets.UTF_8);
+                    String value = URLDecoder.decode(parameters[i].substring(p + 1), StandardCharsets.UTF_8);
                     rc.put(name, value);
                 } else {
                     rc.put(parameters[i], null);

activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/StringArrayConverter.java

@@ -54,7 +54,8 @@ public static String convertToString(String[] value) {
             return null;
         }
 
-        StringBuffer result = new StringBuffer(String.valueOf(value[0]));
+        StringBuilder result = new StringBuilder(value.length * 2);
+        result.append(value[0]);
         for (int i = 1; i < value.length; i++) {
             result.append(",").append(value[i]);
         }

activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java

@@ -50,6 +50,7 @@
 import org.apache.activemq.ConfigurationException;
 import org.apache.activemq.Service;
 import org.apache.activemq.advisory.AdvisoryBroker;
+import org.apache.activemq.annotation.Experimental;
 import org.apache.activemq.broker.cluster.ConnectionSplitBroker;
 import org.apache.activemq.broker.jmx.AnnotatedMBean;
 import org.apache.activemq.broker.jmx.BrokerMBeanSupport;
@@ -223,6 +224,7 @@ public class BrokerService implements Service {
     private boolean monitorConnectionSplits = false;
     private int taskRunnerPriority = Thread.NORM_PRIORITY;
     private boolean dedicatedTaskRunner;
+    private boolean virtualThreadTaskRunner;
     private boolean cacheTempDestinations = false;// useful for failover
     private int timeBeforePurgeTempDestinations = 5000;
     private final List<Runnable> shutdownHooks = new ArrayList<>();
@@ -1269,7 +1271,7 @@ public void setPersistenceAdapter(PersistenceAdapter persistenceAdapter) throws
     public TaskRunnerFactory getTaskRunnerFactory() {
         if (this.taskRunnerFactory == null) {
             this.taskRunnerFactory = new TaskRunnerFactory("ActiveMQ BrokerService["+getBrokerName()+"] Task", getTaskRunnerPriority(), true, 1000,
-                    isDedicatedTaskRunner());
+                    isDedicatedTaskRunner(), isVirtualThreadTaskRunner());
             this.taskRunnerFactory.setThreadClassLoader(this.getClass().getClassLoader());
         }
         return this.taskRunnerFactory;
@@ -1280,9 +1282,10 @@ public void setTaskRunnerFactory(TaskRunnerFactory taskRunnerFactory) {
     }
 
     public TaskRunnerFactory getPersistenceTaskRunnerFactory() {
+        // [AMQ-9394] TODO: Should we have a separate config flag for virtualThread for persistence task runner?
         if (taskRunnerFactory == null) {
             persistenceTaskRunnerFactory = new TaskRunnerFactory("Persistence Adaptor Task", persistenceThreadPriority,
-                    true, 1000, isDedicatedTaskRunner());
+                    true, 1000, isDedicatedTaskRunner(), isVirtualThreadTaskRunner());
         }
         return persistenceTaskRunnerFactory;
     }
@@ -1891,6 +1894,15 @@ public void setDedicatedTaskRunner(boolean dedicatedTaskRunner) {
         this.dedicatedTaskRunner = dedicatedTaskRunner;
     }
 
+   public boolean isVirtualThreadTaskRunner() {
+        return virtualThreadTaskRunner;
+    }
+
+    @Experimental("Tech Preview for Virtaul Thread support")
+    public void setVirtualThreadTaskRunner(boolean virtualThreadTaskRunner) {
+        this.virtualThreadTaskRunner = virtualThreadTaskRunner;
+    }
+
     public boolean isCacheTempDestinations() {
         return cacheTempDestinations;
     }

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java

@@ -280,11 +280,41 @@ public ObjectName[] getTopics() {
         return safeGetBroker().getTopicsNonSuppressed();
     }
 
+    @Override
+    public int getTotalTopicsCount() {
+        return safeGetBroker().getTopicRegion().getDestinationMap().size();
+    }
+
+    @Override
+    public int getTotalManagedTopicsCount() {
+        return safeGetBroker().getTopicsNonSuppressed().length;
+    }
+
+    @Override
+    public int getTotalTemporaryTopicsCount() {
+        return safeGetBroker().getTempTopicRegion().getDestinationMap().size();
+    }
+
     @Override
     public ObjectName[] getQueues() {
         return safeGetBroker().getQueuesNonSuppressed();
     }
 
+    @Override
+    public int getTotalQueuesCount() {
+        return safeGetBroker().getQueueRegion().getDestinationMap().size();
+    }
+
+    @Override
+    public int getTotalManagedQueuesCount() {
+        return safeGetBroker().getQueuesNonSuppressed().length;
+    }
+
+    @Override
+    public int getTotalTemporaryQueuesCount() {
+        return safeGetBroker().getTempQueueRegion().getDestinationMap().size();
+    }
+
     @Override
     public String queryQueues(String filter, int page, int pageSize) throws IOException {
         return DestinationsViewFilter.create(filter)
@@ -517,6 +547,16 @@ public boolean isSlave() {
         return brokerService.isSlave();
     }
 
+    @Override
+    public boolean isDedicatedTaskRunner() {
+        return brokerService.isDedicatedTaskRunner();
+    }
+
+    @Override
+    public boolean isVirtualThreadTaskRunner() {
+        return brokerService.isVirtualThreadTaskRunner();
+    }
+
     private ManagedRegionBroker safeGetBroker() {
         if (broker == null) {
             throw new IllegalStateException("Broker is not yet started.");

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java

@@ -179,9 +179,27 @@ public interface BrokerViewMBean extends Service {
     @MBeanInfo("Topics (broadcasted 'queues'); generally system information.")
     ObjectName[] getTopics();
 
+    @MBeanInfo("Total number of topics")
+    int getTotalTopicsCount();
+
+    @MBeanInfo("Total number of non suppressed topics")
+    int getTotalManagedTopicsCount();
+
+    @MBeanInfo("Total number of temporary topics")
+    int getTotalTemporaryTopicsCount();
+
     @MBeanInfo("Standard Queues containing AIE messages.")
     ObjectName[] getQueues();
 
+    @MBeanInfo("Total number of queues")
+    int getTotalQueuesCount();
+
+    @MBeanInfo("Total number of non suppressed queues")
+    int getTotalManagedQueuesCount();
+
+    @MBeanInfo("Total number of temporary queues")
+    int getTotalTemporaryQueuesCount();
+
     /**
      * Queue Query API, take a look at {@link DestinationsViewFilter} for more information
      */
@@ -335,4 +353,11 @@ public interface BrokerViewMBean extends Service {
 
     @MBeanInfo(value="The total number of times that the max number of uncommitted count has been exceeded across all destinations")
     long getTotalMaxUncommittedExceededCount();
+
+    @MBeanInfo("Dedicated Task Runner enabled.")
+    boolean isDedicatedTaskRunner();
+
+    @MBeanInfo("Virtual Thread Task Runner enabled.")
+    boolean isVirtualThreadTaskRunner();
+
 }

activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java

@@ -240,10 +240,10 @@ public void send(ProducerBrokerExchange producerExchange, final Message messageS
         final Object delayValue = messageSend.getProperty(ScheduledMessage.AMQ_SCHEDULED_DELAY);
 
         String physicalName = messageSend.getDestination().getPhysicalName();
-        boolean schedularManage = physicalName.regionMatches(true, 0, ScheduledMessage.AMQ_SCHEDULER_MANAGEMENT_DESTINATION, 0,
+        boolean schedulerManage = physicalName.regionMatches(true, 0, ScheduledMessage.AMQ_SCHEDULER_MANAGEMENT_DESTINATION, 0,
             ScheduledMessage.AMQ_SCHEDULER_MANAGEMENT_DESTINATION.length());
 
-        if (schedularManage == true) {
+        if (schedulerManage == true) {
 
             JobScheduler scheduler = getInternalScheduler();
             ActiveMQDestination replyTo = messageSend.getReplyTo();

activemq-broker/src/main/java/org/apache/activemq/security/JaasDualAuthenticationBroker.java

@@ -110,7 +110,7 @@ public void removeConnection(ConnectionContext context, ConnectionInfo info, Thr
         }
     }
 
-    private boolean isSSL(ConnectionContext context, ConnectionInfo info) throws Exception {
+    protected boolean isSSL(ConnectionContext context, ConnectionInfo info) throws Exception {
         boolean sslCapable = false;
         Connector connector = context.getConnector();
         if (connector instanceof TransportConnector) {

activemq-broker/src/test/java/org/apache/activemq/store/PListTestSupport.java

@@ -128,11 +128,9 @@ private PListEntry getFirst(PList plist) throws IOException {
     }
 
     protected void doTestRemove(final int COUNT) throws IOException {
-        Map<String, ByteSequence> map = new LinkedHashMap<String, ByteSequence>();
         for (int i = 0; i < COUNT; i++) {
             String test = new String("test" + i);
             ByteSequence bs = new ByteSequence(test.getBytes());
-            map.put(test, bs);
             plist.addLast(test, bs);
         }
         assertEquals(plist.size(), COUNT);

activemq-client/pom.xml

@@ -200,15 +200,21 @@
         <configuration>
           <instructions>
             <Import-Package>
+              !java.*,
+              !javax.naming*,
+              !javax.net*,
+              !org.apache.activemq*,
               !com.google.errorprone.annotations,
               !com.google.errorprone.annotations.concurrent,
               com.thoughtworks.xstream.*;resolution:="optional",
+              javax.jmdns.*;resolution:="optional",
               *
             </Import-Package>
             <Private-Package>
               com.google.errorprone.annotations,
               com.google.errorprone.annotations.concurrent
             </Private-Package>
+            <Multi-Release>true</Multi-Release>
             <_noee>true</_noee>
           </instructions>
         </configuration>
@@ -396,5 +402,32 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk21-plus</id>
+      <activation>
+        <jdk>[21,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>java21-compile</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+                <configuration>
+                  <release>21</release> <!-- Specific Java version for alternative classes -->
+                  <compileSourceRoots>${project.basedir}/src/main/java21</compileSourceRoots>
+                  <multiReleaseOutput>true</multiReleaseOutput>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins> 
+      </build>
+    </profile>
   </profiles>
 </project>