From 1560c884ec7c03451a12283e507ea46adeadaf8c Mon Sep 17 00:00:00 2001
From: Justin Bertram <jbertram@apache.org>
Date: Mon, 7 Jul 2025 08:46:10 -0500
Subject: [PATCH 1/2] NO-JIRA proper Checkstyle config

---
 artemis-console-extension/pom.xml |   1 +
 artemis-console-war/pom.xml       |   4 +
 etc/checkstyle.xml                | 130 ++++++++++++++++++++++++++++++
 pom.xml                           |  26 ++++++
 4 files changed, 161 insertions(+)
 create mode 100644 etc/checkstyle.xml

diff --git a/artemis-console-extension/pom.xml b/artemis-console-extension/pom.xml
index 820989c..dbc3ce4 100644
--- a/artemis-console-extension/pom.xml
+++ b/artemis-console-extension/pom.xml
@@ -35,6 +35,7 @@
         <!-- Path to the Hawtio TypeScript plugin -->
         <extension.path>artemis-extension</extension.path>
         <extension.install.dir>artemis-extension</extension.install.dir>
+        <activemq.basedir>${project.parent.basedir}</activemq.basedir>
     </properties>
     <build>
         <finalName>${project.artifactId}</finalName>
diff --git a/artemis-console-war/pom.xml b/artemis-console-war/pom.xml
index 20ceb40..b3ef626 100644
--- a/artemis-console-war/pom.xml
+++ b/artemis-console-war/pom.xml
@@ -31,6 +31,10 @@
 
     <name>ActiveMQ Artemis Console War</name>
 
+    <properties>
+        <activemq.basedir>${project.parent.basedir}</activemq.basedir>
+    </properties>
+
     <dependencies>
         <!-- we need to depend on this for the build output -->
         <dependency>
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
new file mode 100644
index 0000000..8df9f26
--- /dev/null
+++ b/etc/checkstyle.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!-- See http://checkstyle.sourceforge.net/checks.html for documentation on available checks -->
+<module name="Checker">
+   <!-- Checks to see if a file contains a tab character. -->
+   <module name="FileTabCharacter">
+      <property name="eachLine" value="true"/>
+   </module>
+
+   <!-- Checks for trailing whitespace. -->
+   <module name="RegexpSingleline">
+      <!-- \s matches whitespace character, $ matches end of line. -->
+      <property name="format" value="\s+$"/>
+      <property name="message" value="Line has trailing spaces."/>
+   </module>
+
+   <module name="TreeWalker">
+      <module name="AtclauseOrder"/>
+      <module name="NonEmptyAtclauseDescription"/>
+      <module name="SingleLineJavadoc">
+         <property name="ignoreInlineTags" value="false"/>
+      </module>
+      <module name="InvalidJavadocPosition"/>
+      <module name="JavadocBlockTagLocation"/>
+      <module name="JavadocContentLocation"/>
+      <module name="JavadocLeadingAsteriskAlign" />
+      <module name="JavadocMissingLeadingAsterisk"/>
+      <module name="JavadocMissingWhitespaceAfterAsterisk"/>
+
+      <!-- Checks for imports -->
+      <module name="AvoidStarImport"/>
+      <module name="RedundantImport"/>
+      <module name="UnusedImports"/>
+
+      <!-- Modifier Checks -->
+      <module name="ModifierOrder"/>
+      <module name="RedundantModifier"/>
+
+      <!-- Checks for common coding problems -->
+      <module name="EmptyStatement"/>
+      <!-- Checks that classes that override equals() also override hashCode(). -->
+      <module name="EqualsHashCode"/>
+      <!-- Checks for illegal instantiations where a factory method is preferred. -->
+      <module name="IllegalInstantiation"/>
+
+      <!-- Checks that long constants are defined with an upper ell. -->
+      <module name="UpperEll"/>
+      <!-- This check makes sure that all package annotations are in the package-info.java file. -->
+      <module name="PackageAnnotation"/>
+      <!-- Checks that if a class defines a covariant method equals, then it defines method equals(java.lang.Object). -->
+      <module name="CovariantEquals"/>
+      <!-- Checks the style of array type definitions. -->
+      <module name="ArrayTypeStyle"/>
+      <!-- Make sure left curly braces are on the same line. -->
+      <module name="LeftCurly"/>
+
+      <module name="RightCurly"/>
+      <module name="RightCurly">
+         <property name="option" value="alone"/>
+         <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+      </module>
+      <!-- Checks that there is no whitespace after certain tokens; e.g. "." and "!". -->
+      <module name="NoWhitespaceAfter"/>
+      <!-- Checks that there is no whitespace before certain tokens; e.g. "++" and ";". -->
+      <module name="NoWhitespaceBefore"/>
+      <!-- Checks that most tokens are surrounded by whitespace. RCURLY is omitted so we can do stuff like "new Thread(){...}.start()". -->
+      <module name="WhitespaceAround">
+         <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
+      </module>
+      <module name="WhitespaceAfter">
+         <property name="tokens" value="COMMA"/>
+      </module>
+      <module name="ParenPad">
+         <property name="option" value="nospace"/>
+      </module>
+      <!-- Ensure there is no space between the identifier of a method definition, constructor definition, method call, or constructor invocation and the left parenthesis of the parameter list. -->
+      <module name="MethodParamPad"/>
+      <!-- Ensure proper indentation. -->
+      <module name="Indentation">
+         <property name="basicOffset" value="3"/>
+         <property name="caseIndent" value="3"/>
+         <property name="throwsIndent" value="3"/>
+         <property name="arrayInitIndent" value="3"/>
+         <property name="lineWrappingIndentation" value="3"/>
+      </module>
+
+      <module name="IllegalImport">
+         <property name="illegalPkgs" value="junit.framework"/>
+      </module>
+
+      <module name="WriteTag">
+         <property name="tag" value="@author"/>
+         <property name="tagSeverity" value="error"/>
+         <property name="severity" value="ignore"/>
+      </module>
+
+      <module name="UnnecessarySemicolonInTryWithResources"/>
+
+      <!-- begin Sevntu checks, http://sevntu-checkstyle.github.io/sevntu.checkstyle/ -->
+      <module name="DiamondOperatorForVariableDefinition"/>
+      <module name="RequiredParameterForAnnotation">
+         <property name="annotationName" value="Parameterized.Parameters"/>
+         <property name="requiredParameters" value="name"/>
+      </module>
+      <!-- end Sevntu checks -->
+   </module>
+</module>
diff --git a/pom.xml b/pom.xml
index ecc1bcd..458b9af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
     <url>https://activemq.apache.org/components/artemis/</url>
 
     <properties>
+        <activemq.basedir>${project.basedir}</activemq.basedir>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.release>17</maven.compiler.release>
@@ -53,6 +54,8 @@
         <yarn-version>v1.22.22</yarn-version>
         <frontend-maven-plugin-version>1.15.1</frontend-maven-plugin-version>
         <project.build.outputTimestamp>2025-06-25T05:17:39Z</project.build.outputTimestamp>
+        <sevntu.checks.version>1.44.1</sevntu.checks.version>
+        <checkstyle.version>10.26.1</checkstyle.version>
     </properties>
 
     <scm>
@@ -228,6 +231,29 @@
                         <tagNameFormat>@{project.version}</tagNameFormat>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.github.sevntu-checkstyle</groupId>
+                            <artifactId>sevntu-checks</artifactId>
+                            <version>${sevntu.checks.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.puppycrawl.tools</groupId>
+                            <artifactId>checkstyle</artifactId>
+                            <version>${checkstyle.version}</version>
+                        </dependency>
+                    </dependencies>
+                    <configuration>
+                        <configLocation>${activemq.basedir}/etc/checkstyle.xml</configLocation>
+                        <failsOnError>false</failsOnError>
+                        <failOnViolation>true</failOnViolation>
+                        <consoleOutput>true</consoleOutput>
+                        <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

From c438d6d99b31e46014bb69f6701ff6f91a64944d Mon Sep 17 00:00:00 2001
From: Justin Bertram <jbertram@apache.org>
Date: Mon, 7 Jul 2025 08:22:23 -0500
Subject: [PATCH 2/2] ARTEMIS-5427 integrate Jolokia's MBeanInfo cache

---
 artemis-console-cache-key-provider/pom.xml    | 51 +++++++++++++++++++
 .../jolokia/ArtemisCacheKeyProvider.java      | 41 +++++++++++++++
 .../META-INF/jolokia/services-default         | 16 ++++++
 artemis-console-war/pom.xml                   |  5 ++
 pom.xml                                       |  3 ++
 5 files changed, 116 insertions(+)
 create mode 100644 artemis-console-cache-key-provider/pom.xml
 create mode 100644 artemis-console-cache-key-provider/src/main/java/org/apache/activemq/artemis/jolokia/ArtemisCacheKeyProvider.java
 create mode 100644 artemis-console-cache-key-provider/src/main/resources/META-INF/jolokia/services-default

diff --git a/artemis-console-cache-key-provider/pom.xml b/artemis-console-cache-key-provider/pom.xml
new file mode 100644
index 0000000..eb1d405
--- /dev/null
+++ b/artemis-console-cache-key-provider/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>artemis-console-project</artifactId>
+      <version>1.3.0-SNAPSHOT</version>
+   </parent>
+
+   <groupId>org.apache.activemq</groupId>
+   <artifactId>artemis-console-cache-key-provider</artifactId>
+   <packaging>jar</packaging>
+
+
+   <name>ActiveMQ Artemis Console Cache Key Provider</name>
+
+   <properties>
+      <activemq.basedir>${project.parent.basedir}</activemq.basedir>
+   </properties>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.jolokia</groupId>
+         <artifactId>jolokia-service-jmx</artifactId>
+         <version>${jolokia.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-server</artifactId>
+         <version>${activemq.artemis.version}</version>
+      </dependency>
+   </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/artemis-console-cache-key-provider/src/main/java/org/apache/activemq/artemis/jolokia/ArtemisCacheKeyProvider.java b/artemis-console-cache-key-provider/src/main/java/org/apache/activemq/artemis/jolokia/ArtemisCacheKeyProvider.java
new file mode 100644
index 0000000..bf6fc2e
--- /dev/null
+++ b/artemis-console-cache-key-provider/src/main/java/org/apache/activemq/artemis/jolokia/ArtemisCacheKeyProvider.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.jolokia;
+
+import javax.management.ObjectInstance;
+
+import org.jolokia.service.jmx.api.CacheKeyProvider;
+
+public class ArtemisCacheKeyProvider extends CacheKeyProvider {
+
+   public ArtemisCacheKeyProvider(int pOrderId) {
+      super(pOrderId);
+   }
+
+   @Override
+   public String determineKey(ObjectInstance objectInstance) {
+      try {
+         if (Class.forName("org.apache.activemq.artemis.core.management.impl.AbstractControl").isAssignableFrom(Class.forName(objectInstance.getClassName()))) {
+            return objectInstance.getClassName();
+         }
+      } catch (Exception e) {
+         // ignore
+      }
+
+      return null;
+   }
+}
\ No newline at end of file
diff --git a/artemis-console-cache-key-provider/src/main/resources/META-INF/jolokia/services-default b/artemis-console-cache-key-provider/src/main/resources/META-INF/jolokia/services-default
new file mode 100644
index 0000000..73ab129
--- /dev/null
+++ b/artemis-console-cache-key-provider/src/main/resources/META-INF/jolokia/services-default
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+org.apache.activemq.artemis.jolokia.ArtemisCacheKeyProvider,100
\ No newline at end of file
diff --git a/artemis-console-war/pom.xml b/artemis-console-war/pom.xml
index b3ef626..a1fa1d6 100644
--- a/artemis-console-war/pom.xml
+++ b/artemis-console-war/pom.xml
@@ -36,6 +36,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-console-cache-key-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <!-- we need to depend on this for the build output -->
         <dependency>
             <groupId>org.apache.activemq</groupId>
diff --git a/pom.xml b/pom.xml
index 458b9af..266112f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
         <module>artemis-console-extension</module>
         <module>artemis-console-war</module>
         <module>artemis-console-distribution</module>
+        <module>artemis-console-cache-key-provider</module>
     </modules>
 
     <name>ActiveMQ Artemis Console Project</name>
@@ -45,6 +46,8 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.release>17</maven.compiler.release>
+        <activemq.artemis.version>2.41.0</activemq.artemis.version>
+        <jolokia.version>2.2.9</jolokia.version>
         <hawtio.version>4.4.1</hawtio.version>
         <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
         <slf4j.version>2.0.17</slf4j.version>