This is an automated email from the ASF dual-hosted git repository.
clebertsuconic 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 a2357b9d6d ARTEMIS-5210 bump com.google.errorprone:error_prone_core
from 2.31.0 to 2.36.0
a2357b9d6d is described below
commit a2357b9d6dc186d555132c51b259e433daa7a099
Author: Justin Bertram <[email protected]>
AuthorDate: Wed Dec 11 15:14:58 2024 -0600
ARTEMIS-5210 bump com.google.errorprone:error_prone_core from 2.31.0 to
2.36.0
---
.../main/java/org/apache/activemq/artemis/utils/bean/MetaBean.java | 4 ----
pom.xml | 3 ++-
.../activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java | 7 +------
.../artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java | 4 ++--
.../activemq/artemis/tests/soak/paging/FlowControlPagingTest.java | 2 +-
.../activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java | 2 +-
6 files changed, 7 insertions(+), 15 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
index 70fbcb2c6d..b081101a27 100644
---
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,6 @@ public class MetaBean<T> {
}
} else if (type == Boolean.class) {
builder.add(name, (Boolean) value);
- } 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));
} else {
builder.add(name, String.valueOf(value));
}
diff --git a/pom.xml b/pom.xml
index 82208296fb..1cd630bbf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<jetty.version>12.0.15</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/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
index a338fc5dd1..bf1da2c1ca 100644
---
a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
+++
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
@@ -276,12 +276,7 @@ public class ArtemisBrokerWrapper extends
ArtemisBrokerBase {
throw new IllegalArgumentException("Method only accept queue type
parameter.");
}
long count = 0;
- String qname = null;
- if (amq5Dest.isTemporary()) {
- qname = amq5Dest.getPhysicalName();
- } else {
- qname = amq5Dest.getPhysicalName();
- }
+ String qname = amq5Dest.getPhysicalName();
Binding binding =
server.getPostOffice().getBinding(SimpleString.of(qname));
if (binding != null) {
QueueImpl q = (QueueImpl) binding.getBindable();
diff --git
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
index 52f4a0f26d..e5710ca7d9 100644
---
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
+++
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
@@ -1952,9 +1952,9 @@ public abstract class JournalImplTestUnit extends
JournalImplTestBase {
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/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java
index d1f28da0d8..0c670da46f 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java
@@ -205,7 +205,7 @@ public class FlowControlPagingTest extends SoakTestBase {
} 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/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java
index 030d060a6d..327271b6be 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java
@@ -237,7 +237,7 @@ public class SubscriptionPagingTest extends SoakTestBase {
} 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!");
}
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
