ARTEMIS-5210 bump com.google.errorprone:error_prone_core from 2.31.0 …

…to 2.36.0
apache · Dec 11, 2024 · b8c844c · b8c844c
1 parent ca8d57e
commit b8c844c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/bean/MetaBean.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/bean/MetaBean.java
@@ -123,10 +123,9 @@ public void parseToJSON(T object, JsonObjectBuilder builder, boolean ignoreNullA
                }
             } else if (type == Boolean.class) {
                builder.add(name, (Boolean) value);
+            /* This is the same as the default, but keeping this in case we have to deal with Enums in the future
             } else if (Enum.class.isAssignableFrom(type)) {
-               // I know this is the same as the default else clause further down
-               // but i wanted to have a separate branch in case we have to deal with it later
-               builder.add(name, String.valueOf(value));
+               builder.add(name, String.valueOf(value));*/
             } else {
                builder.add(name, String.valueOf(value));
             }

diff --git a/pom.xml b/pom.xml
@@ -110,7 +110,7 @@
       <jetty.version>10.0.24</jetty.version>
       <jetty-servlet-api.version>4.0.6</jetty-servlet-api.version>
       <jgroups.version>5.3.13.Final</jgroups.version>
-      <errorprone.version>2.31.0</errorprone.version>
+      <errorprone.version>2.36.0</errorprone.version>
       <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
       <jib.maven.plugin.version>3.4.4</jib.maven.plugin.version>
       <versions.maven.plugin.version>2.16.1</versions.maven.plugin.version>
@@ -331,6 +331,7 @@
                         <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+                        <arg>--should-stop=ifError=FLOW</arg>
                      </compilerArgs>
                      <annotationProcessorPaths combine.children="append">
                         <path>

diff --git a/...in/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java b/...in/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
@@ -1952,9 +1952,9 @@ public void testPrepareReclaim() throws Exception {
       journal.processBackup();
       List<String> files10 = fileFactory.listFiles(fileExtension);
 
-      assertEquals(journal.getAlignment() == 1 ? 5 : 5, files10.size());
+      assertEquals(5, files10.size());
 
-      assertEquals(journal.getAlignment() == 1 ? 3 : 3, journal.getDataFilesCount());
+      assertEquals(3, journal.getDataFilesCount());
       assertEquals(0, journal.getFreeFilesCount());
       assertEquals(2, journal.getIDMapSize());
 

diff --git a/...ts/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java b/...ts/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java
@@ -205,7 +205,7 @@ public void testFlow() throws Exception {
       } else if (protocol.equals("OPENWIRE")) {
          factoryClient = CFUtil.createConnectionFactory("OPENWIRE", "tcp://localhost:61616");  // no flow control on openwire by default
       } else {
-         factoryClient = CFUtil.createConnectionFactory("OPENWIRE", "tcp://localhost:61616");  // no flow control on openwire by default
+         throw new IllegalStateException("protocol not defined!");
       }
 
       Connection connectionConsumer = factoryClient.createConnection();

diff --git a/...s/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java b/...s/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java
@@ -237,7 +237,7 @@ public void testSubscription() throws Exception {
       } else if (protocol.equals("OPENWIRE")) {
          factoryClient = CFUtil.createConnectionFactory("OPENWIRE", "tcp://localhost:61616");  // no flow control on openwire by default
       } else {
-         factoryClient = CFUtil.createConnectionFactory("OPENWIRE", "tcp://localhost:61616");  // no flow control on openwire by default
+         throw new IllegalStateException("protocol not defined!");
       }
 
       {