Skip to content

Commit

Permalink
ARTEMIS-4752 upgrade ErrorProne to 2.27.0
Browse files Browse the repository at this point in the history
The upgraded ErrorProne found some new issues so this commit fixes those
as well.
  • Loading branch information
jbertram committed May 1, 2024
1 parent 14e83fa commit 9db98cb
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<jetty.version>10.0.20</jetty.version>
<jetty-servlet-api.version>4.0.6</jetty-servlet-api.version>
<jgroups.version>5.3.4.Final</jgroups.version>
<errorprone.version>2.24.1</errorprone.version>
<errorprone.version>2.27.0</errorprone.version>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
<jib.maven.plugin.version>3.3.2</jib.maven.plugin.version>
<versions.maven.plugin.version>2.16.1</versions.maven.plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2620,7 +2620,7 @@ public void testListConsumersAsJSON() throws Exception {
second = array.getJsonObject(0);
}

Assert.assertNotNull(first.getJsonNumber(ConsumerField.ID.getAlternativeName()).longValue());
Assert.assertNotNull(first.getJsonNumber(ConsumerField.ID.getAlternativeName()));
Assert.assertTrue(first.getString(ConsumerField.CONNECTION.getAlternativeName()).length() > 0);
Assert.assertEquals(factory.getConnection().getID().toString(), first.getString(ConsumerField.CONNECTION.getAlternativeName()));
Assert.assertTrue(first.getString(ConsumerField.SESSION.getAlternativeName()).length() > 0);
Expand All @@ -2633,7 +2633,7 @@ public void testListConsumersAsJSON() throws Exception {
// test the old version that has been replaced for backward compatibility
Assert.assertEquals(0, first.getJsonNumber(ConsumerField.MESSAGES_IN_TRANSIT.getAlternativeName()).longValue());

Assert.assertNotNull(second.getJsonNumber(ConsumerField.ID.getAlternativeName()).longValue());
Assert.assertNotNull(second.getJsonNumber(ConsumerField.ID.getAlternativeName()));
Assert.assertTrue(second.getString(ConsumerField.CONNECTION.getAlternativeName()).length() > 0);
Assert.assertEquals(factory.getConnection().getID().toString(), second.getString(ConsumerField.CONNECTION.getAlternativeName()));
Assert.assertTrue(second.getString(ConsumerField.SESSION.getAlternativeName()).length() > 0);
Expand Down Expand Up @@ -2704,7 +2704,7 @@ public void testListAllConsumersAsJSON() throws Exception {
JsonObject second = sorted[1];

Assert.assertTrue(first.getJsonNumber(ConsumerField.CREATION_TIME.getName()).longValue() > 0);
Assert.assertNotNull(first.getJsonNumber(ConsumerField.ID.getAlternativeName()).longValue());
Assert.assertNotNull(first.getJsonNumber(ConsumerField.ID.getAlternativeName()));
Assert.assertTrue(first.getString(ConsumerField.CONNECTION.getAlternativeName()).length() > 0);
Assert.assertEquals(factory.getConnection().getID().toString(), first.getString(ConsumerField.CONNECTION.getAlternativeName()));
Assert.assertTrue(first.getString(ConsumerField.SESSION.getAlternativeName()).length() > 0);
Expand All @@ -2719,7 +2719,7 @@ public void testListAllConsumersAsJSON() throws Exception {
Assert.assertEquals(0, first.getJsonNumber(ConsumerField.LAST_ACKNOWLEDGED_TIME.getName()).longValue());

Assert.assertTrue(second.getJsonNumber(ConsumerField.CREATION_TIME.getName()).longValue() > 0);
Assert.assertNotNull(second.getJsonNumber(ConsumerField.ID.getAlternativeName()).longValue());
Assert.assertNotNull(second.getJsonNumber(ConsumerField.ID.getAlternativeName()));
Assert.assertTrue(second.getString(ConsumerField.CONNECTION.getAlternativeName()).length() > 0);
Assert.assertEquals(factory2.getConnection().getID().toString(), second.getString(ConsumerField.CONNECTION.getAlternativeName()));
Assert.assertTrue(second.getString(ConsumerField.SESSION.getAlternativeName()).length() > 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ public void testPropertiesConfigReload() throws Exception {
Assert.assertTrue(server.getActiveMQServerControl().getStatus().contains("2"));

// verify some server attributes
Assert.assertNotNull(server.getActiveMQServerControl().getStatus().contains("version"));
Assert.assertNotNull(server.getActiveMQServerControl().getStatus().contains("uptime"));
Assert.assertTrue(server.getActiveMQServerControl().getStatus().contains("version"));
Assert.assertTrue(server.getActiveMQServerControl().getStatus().contains("uptime"));

} finally {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public void testSendReceiveLargePersistentMessages() throws Exception {
unsubFrame.addHeader("receipt", "567");
ClientStompFrame response = conn.sendFrame(unsubFrame);
assertNotNull(response);
assertNotNull(response.getCommand().equals("RECEIPT"));
assertTrue(response.getCommand().equals("RECEIPT"));

conn.disconnect();
}
Expand Down Expand Up @@ -186,7 +186,7 @@ public void testReceiveLargePersistentMessagesFromCore() throws Exception {
unsubFrame.addHeader("receipt", "567");
ClientStompFrame response = conn.sendFrame(unsubFrame);
assertNotNull(response);
assertNotNull(response.getCommand().equals("RECEIPT"));
assertTrue(response.getCommand().equals("RECEIPT"));

conn.disconnect();
}
Expand Down Expand Up @@ -324,7 +324,7 @@ public void testReceiveLargeCompressedToRegularPersistentMessagesFromCore() thro
unsubFrame.addHeader("receipt", "567");
ClientStompFrame response = conn.sendFrame(unsubFrame);
assertNotNull(response);
assertNotNull(response.getCommand().equals("RECEIPT"));
assertTrue(response.getCommand().equals("RECEIPT"));

conn.disconnect();
}
Expand Down

0 comments on commit 9db98cb

Please sign in to comment.