ARTEMIS-5266 code gardening after move to Java 17 #5477

jbertram · 2025-01-28T16:20:53Z

No description provided.

jbertram · 2025-01-28T16:21:12Z

Full test-suite is good on this.

gemmellr · 2025-01-28T16:57:57Z

...mis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/LongHashSetTest.java

@@ -327,7 +326,7 @@ public void containsEmptySet() {
      final LongHashSet other = new LongHashSet(100);

      assertTrue(testSet.containsAll(other));
-      assertTrue(testSet.containsAll((Collection<?>) other));
+      assertTrue(testSet.containsAll(other));


These aren't redundant casts. The class has its own containsAll(LongHashSet) but really has 2 methods as it also inherits containsAll(Collection) (unclear if it shouldnt be overriding it).

Notice all the changed lines result in duplicate assertions; this cast is the test trying to force which method is used in order to check both methods.

gemmellr · 2025-01-28T17:10:05Z

...pache/activemq/artemis/tests/integration/amqp/largemessages/InterruptedAMQPLargeMessage.java

@@ -147,7 +147,7 @@ public void testInterruptedLargeMessage() throws Exception {
      AmqpReceiver receiver = session.createReceiver(getQueueName());

      int received = 0;
-      receiver.flow((int) (messageCount + 10));
+      receiver.flow((messageCount + 10));


Can also lose the second set of parentheses that were needed for the cast that was removed.

gemmellr · 2025-01-28T17:29:28Z

...vemq5-unit-tests/src/test/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageTest.java

@@ -40,7 +40,6 @@ public Object createObject() throws Exception {
   @Override
   protected void populateObject(Object object) throws Exception {
      super.populateObject(object);
-      ActiveMQBytesMessage info = (ActiveMQBytesMessage) object;


This removal then also renders the entire method superflous since all it does is call super.

I'd either leave it as it is, since these are originally generated files from ported tests (so the more we change them, the further from the originals they go)...or delete the methods instead of just the variable.

Same goes for the likely tens of other similar cases

I reverted the relevant changes in that module.

gemmellr · 2025-01-28T17:41:06Z

tests/db-tests/src/test/java/org/apache/activemq/artemis/tests/db/paging/PagingTest.java

@@ -424,8 +425,6 @@ public void testSimpleCursorIteratorLargeMessage() throws Exception {
      server = createServer(true, config, PAGE_SIZE, PAGE_MAX);
      server.start();

-      final int numberOfBytes = 200 * 1024;


The method says it is for testing LargeMessage, yet it isnt using the numberOfBytes variable, and doesnt obliviously appear to be using large messages.

Rather than needing removal, this seems more like its indicating a test bug that needs fixed?

I sent a new, separate commit to deal with this.

gemmellr · 2025-01-28T17:56:37Z

...va/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java

      for (Pair<Long, Integer> pair : primaryIds) {
-         total += pair.getB();


Not sure we need empty loop this leaves, both here and the similar one that follows immediately.

I would instead wonder what they originally existed to do and whether the test simply isnt/wasnt checking something that it was actually meant to.

gemmellr · 2025-01-28T18:06:30Z

.../java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournaHistorylBackupTest.java

   }

+   // it should be possible to do it


Doesnt seem like this should have moved here

gemmellr · 2025-01-28T18:10:28Z

.../src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java

      {
         StringBuffer buffer = new StringBuffer();
         for (int i = 0; i < 500; i++) {
            buffer.append(" ");
         }
-         bigString = buffer.toString();


The variable may have been unused before but this change just leaves the buffer behind, itself also still effectively unused.

gemmellr · 2025-01-29T11:02:58Z

artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java

Most if not all of the changes in this file appear to be in the wrong commit(s), they are in e95f2ac for ARTEMIS 5272 "eliminate unused private fields" but none of the changes in the file do that, they are a mix of using interface type and text block strings.

This should be fixed now.

gemmellr · 2025-01-29T11:50:24Z

...ore-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java

-   // this is not used... I'm only keeping it here because of Serialization compatibility and Wildfly usage on JNDI.
-   private boolean finalizeCheck;


This one is strange since, it was only made this way in recent years, but the class wasnt Serializable at the time. The history of the file is littered with references to serialization...but the file was seemingly never Serializable in the time since Artemis existed. There is a nested class in the file that is Serializable though.

Is there perhaps another type of serializing the locator that the earlier change here thought needed to be concious of not breaking?

I just left this one alone.

gemmellr · 2025-01-29T11:55:55Z

...s-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java

-   // keeping this field for serialization compatibility only. do not use it
-   private boolean finalizeChecks;


Similar pondering to #5477 (comment), with difference that I can see that the relation to JNDIBaseStorable here probably means this really is actually needed for compatibility and should stay.

Also left this one alone as well.

gemmellr · 2025-01-29T12:43:53Z

...jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java

I would probably be inclined not to change the environment type in this file (or ReadOnlyContext / TestContext / TestContextFactory), they use Hashtable because Context / InitialContext always use Hashtable for the environment, including in the getters.

gemmellr · 2025-01-29T14:53:34Z

...t/src/test/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfoTest.java

+         "maxExpiryDelay":4004,
+         "enableMetrics":false
+         }
+         """;


Not actually an issue, especially for the usage here, but just noting for awareness...the text-block will subtly differ from the original string concats in having a newline at the end, since the closing delimiter is on its own line rather than the same line [and the block also doesnt use the trailing \<line-terminator> escape to suppress a line ending being added when the block is processed].

I was aware of the nuance, but I put the """ on a new line for stylistic purposes since it didn't matter to the test(s). I reversed that decision in the most recent push.

gemmellr · 2025-01-29T14:59:05Z

...t/java/org/apache/activemq/artemis/logs/annotation/processor/LogAnnotationProcessorTest.java

+      doCheckFailureErrorMessageTestImpl(results, """
+         org.apache.activemq.artemis.logs.annotation.processor.cases.LAPTCase1_InvalidIDForRegex: \
+         Code 100 does not match regular expression specified on the LogBundle: [0-9]{1}\
+         """);


Personally I think these were all more readable the way they were.

This is actually more verbose, less obviously just supplying the expected message, and requires understanding of the nuanace of text-block escaping as regards to this 4-line text-block actually being a single string without line ending. No real benefit versus the concats, but various downsides.

I'd leave these unchanged.

That's fair.

gemmellr · 2025-01-29T15:01:54Z

...c/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolLogger.java

-      "\nCould not re-establish AMQP Server Connection {} on {} after {} retries" +
-      "\n*******************************************************************************************************************************\n", level = LogMessage.Level.WARN)
+   @LogMessage(id = 111001, value = """
+      *******************************************************************************************************************************


Did you mean to remove the deliberate newline at the start?
(same for others)

gemmellr · 2025-01-29T15:09:50Z

.../src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java

+   private static String firstPart = """
+      <core xmlns="urn:activemq:core">
+         <name>ActiveMQ.main.config</name>
+         <log-delegate-factory-class-name>org.apache.activemq.artemis.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>
+         <bindings-directory>${jboss.server.data.dir}/activemq/bindings</bindings-directory>
+         <journal-directory>${jboss.server.data.dir}/activemq/journal</journal-directory>
+         <journal-min-files>10</journal-min-files>
+         <large-messages-directory>${jboss.server.data.dir}/activemq/largemessages</large-messages-directory>
+         <paging-directory>${jboss.server.data.dir}/activemq/paging</paging-directory>
+         <connectors>
+            <connector name="netty">tcp://localhost:61616</connector>
+            <connector name="netty-throughput">tcp://localhost:5545</connector>
+            <connector name="in-vm">vm://0</connector>
+         </connectors>
+         <acceptors>
+            <acceptor name="netty">tcp://localhost:5545</acceptor>
+            <acceptor name="netty-throughput">tcp://localhost:5545</acceptor>
+            <acceptor name="in-vm">vm://0</acceptor>
+         </acceptors>
+         <security-settings>
+            <security-setting match="#">
+               <permission type="createNonDurableQueue" roles="guest"/>
+               <permission type="deleteNonDurableQueue" roles="guest"/>
+               <permission type="createDurableQueue" roles="guest"/>
+               <permission type="deleteDurableQueue" roles="guest"/>
+               <permission type="consume" roles="guest"/>
+               <permission type="send" roles="guest"/>
+            </security-setting>
+         </security-settings>
+         <address-settings>
+            <address-setting match="#">
+               <dead-letter-address>DLQ</dead-letter-address>
+               <expiry-address>ExpiryQueue</expiry-address>
+               <redelivery-delay>0</redelivery-delay>
+               <max-size-bytes>10485760</max-size-bytes>
+               <message-counter-history-day-limit>10</message-counter-history-day-limit>
+               <address-full-policy>BLOCK</address-full-policy>
+            </address-setting>
+         </address-settings>
+      """;
+
+   private static String lastPart = "</core>";
+
+   private static String bridgePart = """


Would be safer if final (uppercase might also be nice)

Type safety is better with the empty methods (e.g. emptyList, emptyMap, etc.).

gemmellr · 2025-01-29T15:23:55Z

...org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java

+         appender.console.filter.threshold.level = trace\
+         """));


Possibly simpler to add the close deliminator on the same line than use line ending suppression?

gemmellr · 2025-01-29T15:25:35Z

...ava/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java

+            appender.console.filter.threshold.level = info\
+            """));


gemmellr · 2025-01-29T15:40:23Z

...mis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java

+      } else if (value instanceof Boolean boolean1) {
+         return boolean1;
+      } else if (value instanceof SimpleString string) {
+         return Boolean.valueOf(string.toString());


Things like boolean1 (plus byte1, short1, float1,and double1 etc that follow below) are more than a bit ugly, probably even less readable compared to the casts.

Calling the SimpleString string results in the silly reading string.toString().

gemmellr · 2025-01-29T15:43:28Z

artemis-commons/src/main/java/org/apache/activemq/artemis/utils/runnables/AtomicRunnable.java

+      if (run instanceof AtomicRunnable runnable) {
+         return runnable;


Suggested change

if (run instanceof AtomicRunnable runnable) {

return runnable;

if (run instanceof AtomicRunnable atomicRunnable) {

return atomicRunnable;

It is already a Runnable, so calling it merely runnable right after we determined it is more than just that and return it as a different type, simply reads horribly, far more than the original cast.

gemmellr · 2025-01-29T15:45:54Z

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java

+         if (val instanceof JsonArray jsonArray1) {
+            Object[] inner = fromJsonArray(jsonArray1);


Suggested change

if (val instanceof JsonArray jsonArray1) {

Object[] inner = fromJsonArray(jsonArray1);

if (val instanceof JsonArray jsonArrayValue) {

Object[] inner = fromJsonArray(jsonArrayValue);

gemmellr · 2025-01-29T15:47:52Z

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java

+               if (innerVal instanceof JsonArray jsonArray1) {
+                  innerVal = fromJsonArray(jsonArray1);
+               } else if (innerVal instanceof JsonString string) {
+                  innerVal = string.getString();


Suggested change

if (innerVal instanceof JsonArray jsonArray1) {

innerVal = fromJsonArray(jsonArray1);

} else if (innerVal instanceof JsonString string) {

innerVal = string.getString();

if (innerVal instanceof JsonArray innerJsonArray) {

innerVal = fromJsonArray(innerJsonArray);

} else if (innerVal instanceof JsonString innerJsonString) {

innerVal = innerJsonString.getString();

gemmellr · 2025-01-29T15:48:38Z

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java

+         } else if (val instanceof JsonString string) {
+            array[i] = string.getString();


Suggested change

} else if (val instanceof JsonString string) {

array[i] = string.getString();

} else if (val instanceof JsonString jsonString) {

array[i] = jsonString.getString();

I'm giving up looking at the rest of the json stuff...same type of recent comments+suggestions to make it more readable than originally, rather than arguably less readable, also apply to the rest of it as well.

I think I got all of them.

gemmellr · 2025-01-29T15:51:22Z

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java

+         if (duplicateID instanceof SimpleString string) {
+            return string.getData();


Suggested change

if (duplicateID instanceof SimpleString string) {

return string.getData();

if (duplicateID instanceof SimpleString simpleString) {

return simpleString.getData();

gemmellr · 2025-01-29T15:54:09Z

...s-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java

@@ -328,18 +328,18 @@ private void encodeMap(final ActiveMQBuffer buffer, final Map<String, Object> ma

         Object val = entry.getValue();

-         if (val instanceof Boolean) {
+         if (val instanceof Boolean boolean1) {


booleanVal / longVal / etc style naming or similar , or just leaving the casts, would be more nicer to read later than than boolean1 etc

All should be fixed now.

gemmellr · 2025-01-29T15:57:08Z

...ent/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java

@@ -961,9 +960,9 @@ private int getConnectionWithRetry(final int reconnectAttempts, RemotingConnecti
         }

         if (getConnection() != null) {
-            if (oldConnection != null && oldConnection instanceof CoreRemotingConnection) {
+            if (oldConnection != null && oldConnection instanceof CoreRemotingConnection remotingConnection) {


oldRemotingConnection would be more readable, given its used on the same line as the new CoreRemotingConnection connection

gemmellr · 2025-01-29T17:09:34Z

...jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java

+            if (exception instanceof ActiveMQException qException) {
+               exception = JMSExceptionHelper.convertFromActiveMQException(qException);


Suggested change

if (exception instanceof ActiveMQException qException) {

exception = JMSExceptionHelper.convertFromActiveMQException(qException);

if (exception instanceof ActiveMQException amqException) {

exception = JMSExceptionHelper.convertFromActiveMQException(amqException);

gemmellr · 2025-01-29T17:10:31Z

artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java

@@ -634,8 +634,8 @@ public MessageConsumer createSharedConsumer(Topic topic, String name, String mes
      }
      checkTopic(topic);
      ActiveMQTopic localTopic;
-      if (topic instanceof ActiveMQTopic) {
-         localTopic = (ActiveMQTopic) topic;
+      if (topic instanceof ActiveMQTopic qTopic) {


qException was strange, but qTopic is about the most nonsense thing it could have picked :)

Here and all the others below

qTopic...lol

gemmellr · 2025-01-29T17:13:15Z

...ol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ProtonProtocolManager.java

+         if (message instanceof AMQPMessage pMessage) {
+            return super.invokeInterceptors(this.incomingInterceptors, pMessage, connection);


Suggested change

if (message instanceof AMQPMessage pMessage) {

return super.invokeInterceptors(this.incomingInterceptors, pMessage, connection);

if (message instanceof AMQPMessage amqpMessage) {

return super.invokeInterceptors(this.incomingInterceptors, amqpMessage, connection);

same below

gemmellr · 2025-01-29T17:14:42Z

...ava/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java

+      if (message instanceof AMQPMessage pMessage) {
+         return AMQPMessageBrokerAccessor.getCurrentProperties(pMessage);


Suggested change

if (message instanceof AMQPMessage pMessage) {

return AMQPMessageBrokerAccessor.getCurrentProperties(pMessage);

if (message instanceof AMQPMessage amqpMessage) {

return AMQPMessageBrokerAccessor.getCurrentProperties(amqpMessage);

gemmellr · 2025-01-29T17:16:14Z

...col/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/CoreAmqpConverter.java

+      if (message instanceof AMQPMessage pMessage) {
+         return pMessage;


Suggested change

if (message instanceof AMQPMessage pMessage) {

return pMessage;

if (message instanceof AMQPMessage amqpMessage) {

return amqpMessage;

Plus another below

gemmellr · 2025-01-29T17:21:07Z

...c/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java

@@ -216,8 +216,8 @@ public static org.apache.activemq.artemis.api.core.Message inbound(final Message
      }

      final Object scheduledDelay = messageSend.getProperties().get(ScheduledMessage.AMQ_SCHEDULED_DELAY);
-      if (scheduledDelay instanceof Long) {
-         coreMessage.putLongProperty(org.apache.activemq.artemis.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + ((Long) scheduledDelay));
+      if (scheduledDelay instanceof Long long1) {


Something like delayMs or delayLong would be far more readable later.

Just about every name added below is equally unhelpful, and results in less readable code than the original.

gemmellr · 2025-01-29T17:23:16Z

...selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java

+            if (lv instanceof Comparable comparable && rv instanceof Comparable comparable1) {
+               return compare(comparable, comparable1);


Names need updater or its far readable as it originally was.

Same below

gemmellr · 2025-01-29T17:28:21Z

...mis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java

+                  if (descriptor instanceof MappedPropertyDescriptor propertyDescriptor) {
+                     if (propertyDescriptor.getMappedWriteMethod() == null) {


This and the leg below could use distinct names, e.g mappedPropertyDescriptor and indexedPropertyDescriptor, to make things more readable. Them both using propertyDescriptor now arguably makes it less readable than originally.

gemmellr · 2025-01-29T17:29:48Z

...rc/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java

@@ -116,11 +116,11 @@ public Comparator<T> getComparator() {
         try {
            Object leftValue = getField(left, sortField);
            Object rightValue = getField(right, sortField);
-            if (leftValue instanceof Comparable && rightValue instanceof Comparable) {
+            if (leftValue instanceof Comparable comparable && rightValue instanceof Comparable comparable1) {


Better names would help here...without them, the code below is far more readable as it was than it is after this adjustment.

gemmellr · 2025-01-29T17:32:23Z

artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java

+         if (message != null && message instanceof LargeServerMessage serverMessage) {
+            serverMessage.setStorageManager(storageManager);


Suggested change

if (message != null && message instanceof LargeServerMessage serverMessage) {

serverMessage.setStorageManager(storageManager);

if (message != null && message instanceof LargeServerMessage largeServerMessage) {

largeServerMessage.setStorageManager(storageManager);

gemmellr · 2025-01-29T17:37:20Z

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java

+      if (originalRoutingType != null && originalRoutingType instanceof Byte byte1) {
+         copyMessage.setRoutingType(RoutingType.getType(byte1));


Suggested change

if (originalRoutingType != null && originalRoutingType instanceof Byte byte1) {

copyMessage.setRoutingType(RoutingType.getType(byte1));

if (originalRoutingType != null && originalRoutingType instanceof Byte origRoutingType) {

copyMessage.setRoutingType(RoutingType.getType(origRoutingType));

Similarly below

gemmellr · 2025-01-29T17:38:15Z

...in/java/org/apache/activemq/artemis/core/server/management/ArtemisRbacInvocationHandler.java

@@ -136,15 +136,15 @@ public boolean canInvoke(String name, String operationName) {

   private void initializeFromFirstServerMBeanRegistration(Method method, Object[] args) {
      if (activeMQServer == null && method.getName().equals("registerMBean")) {
-         if (args != null && args[0] instanceof ActiveMQServerControlImpl) {
-            activeMQServer = ((ActiveMQServerControlImpl) args[0]).getServer();
+         if (args != null && args[0] instanceof ActiveMQServerControlImpl impl) {


impl -> control ?

gemmellr · 2025-01-29T17:40:16Z

...mis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/EmbedMessageUtil.java

+         if (returnMessage instanceof LargeServerMessage serverMessage) {
+            serverMessage.setStorageManager(storageManager);


Suggested change

if (returnMessage instanceof LargeServerMessage serverMessage) {

serverMessage.setStorageManager(storageManager);

if (returnMessage instanceof LargeServerMessage largeServerMessage) {

largeServerMessage.setStorageManager(storageManager);

gemmellr · 2025-01-29T17:40:40Z

...mis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java

+      if (message instanceof LargeServerMessage serverMessage) {
+         serverMessage.setStorageManager(storageManager);


gemmellr · 2025-01-29T17:41:50Z

...er/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/JaasCallbackHandler.java

+         } else if (callback instanceof ClientIDCallback dCallback) {
+            dCallback.setClientID(remotingConnection.getClientID());


Suggested change

} else if (callback instanceof ClientIDCallback dCallback) {

dCallback.setClientID(remotingConnection.getClientID());

} else if (callback instanceof ClientIDCallback clientIDCallback) {

clientIDCallback.setClientID(remotingConnection.getClientID());

gemmellr · 2025-01-29T17:56:18Z

finally done looking through the commits. Left 'a couple' of comments hehe. The last commit however, I didnt comment on lots of things that were just more of the same (I noted where in some cases).

For example there are lots of instanceof pattern match name additions like byte1/long1/<other>1, or <last-letter-of-type-prefix>Exception, that make the code far less readable than it was to begin with with the original variable name and a cast. I think the entire commit needs be swept for those and updated before its fit to go in.

jbertram · 2025-01-29T21:12:28Z

I think I addressed all of your comments 🤞 .

gemmellr reviewed Jan 28, 2025

View reviewed changes

gemmellr reviewed Jan 29, 2025

View reviewed changes

jbertram added 4 commits January 29, 2025 09:18

ARTEMIS-5267 use containsKey where possible

6cd2ad3

ARTEMIS-5268 avoid EMPTY_ properties in Collections

001d9a1

Type safety is better with the empty methods (e.g. emptyList, emptyMap, etc.).

ARTEMIS-5269 eliminate redundant toString() invocations

0299a68

ARTEMIS-5270 eliminate redundant casts

bacd8ba

gemmellr reviewed Jan 29, 2025

View reviewed changes

jbertram added 8 commits January 29, 2025 13:52

ARTEMIS-5272 eliminate unused private fields

cbcb869

ARTEMIS-5273 use collection interfaces where possible

370bc58

ARTEMIS-5274 use lambdas where possible

3075f16

ARTEMIS-5275 use line separator method instead of property

27a892a

ARTEMIS-5276 use text blocks where possible

068b133

ARTEMIS-5278 use pattern matching for instanceof

1102019

ARTEMIS-5271 eliminate unused variables

a095f26

NO-JIRA fix testSimpleCursorIteratorLargeMessage

536c5cd

jbertram force-pushed the ARTEMIS-5266 branch from 136a2ec to 536c5cd Compare January 29, 2025 20:29

		for (Pair<Long, Integer> pair : primaryIds) {
		total += pair.getB();

		// this is not used... I'm only keeping it here because of Serialization compatibility and Wildfly usage on JNDI.
		private boolean finalizeCheck;

		// keeping this field for serialization compatibility only. do not use it
		private boolean finalizeChecks;

		if (run instanceof AtomicRunnable runnable) {
		return runnable;

		if (val instanceof JsonArray jsonArray1) {
		Object[] inner = fromJsonArray(jsonArray1);

		} else if (val instanceof JsonString string) {
		array[i] = string.getString();

		if (duplicateID instanceof SimpleString string) {
		return string.getData();

		if (exception instanceof ActiveMQException qException) {
		exception = JMSExceptionHelper.convertFromActiveMQException(qException);

		if (message instanceof AMQPMessage pMessage) {
		return super.invokeInterceptors(this.incomingInterceptors, pMessage, connection);

		if (message instanceof AMQPMessage pMessage) {
		return AMQPMessageBrokerAccessor.getCurrentProperties(pMessage);

		if (message instanceof AMQPMessage pMessage) {
		return pMessage;

		if (lv instanceof Comparable comparable && rv instanceof Comparable comparable1) {
		return compare(comparable, comparable1);

		if (descriptor instanceof MappedPropertyDescriptor propertyDescriptor) {
		if (propertyDescriptor.getMappedWriteMethod() == null) {

		if (message != null && message instanceof LargeServerMessage serverMessage) {
		serverMessage.setStorageManager(storageManager);

		if (originalRoutingType != null && originalRoutingType instanceof Byte byte1) {
		copyMessage.setRoutingType(RoutingType.getType(byte1));

		if (returnMessage instanceof LargeServerMessage serverMessage) {
		serverMessage.setStorageManager(storageManager);

		if (message instanceof LargeServerMessage serverMessage) {
		serverMessage.setStorageManager(storageManager);

		} else if (callback instanceof ClientIDCallback dCallback) {
		dCallback.setClientID(remotingConnection.getClientID());

ARTEMIS-5266 code gardening after move to Java 17 #5477

Are you sure you want to change the base?

ARTEMIS-5266 code gardening after move to Java 17 #5477

Conversation

jbertram commented Jan 28, 2025

jbertram commented Jan 28, 2025

gemmellr Jan 28, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jbertram Jan 29, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gemmellr Jan 29, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gemmellr commented Jan 29, 2025

jbertram commented Jan 29, 2025

gemmellr Jan 28, 2025 •

edited

Loading

jbertram Jan 29, 2025 •

edited

Loading

gemmellr Jan 29, 2025 •

edited

Loading