From 87072e4b4fac831c5f1bb4d1be8066d2df7d6531 Mon Sep 17 00:00:00 2001 From: Piotrek Zygielo Date: Sat, 30 May 2026 14:06:53 +0200 Subject: [PATCH] Move `CacheHashMap` to the only module it is used in --- .../java/com/sun/messaging/jmq/jmsserver}/CacheHashMap.java | 2 +- .../java/com/sun/messaging/jmq/jmsserver/core/Subscription.java | 2 +- .../jmq/jmsserver/data/handlers/TransactionHandler.java | 2 +- .../com/sun/messaging/jmq/jmsserver/plugin/spi/ProducerSpi.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename mq/main/{mqcomm-util/src/main/java/com/sun/messaging/jmq/util => mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver}/CacheHashMap.java (97%) diff --git a/mq/main/mqcomm-util/src/main/java/com/sun/messaging/jmq/util/CacheHashMap.java b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/CacheHashMap.java similarity index 97% rename from mq/main/mqcomm-util/src/main/java/com/sun/messaging/jmq/util/CacheHashMap.java rename to mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/CacheHashMap.java index 40f664b26..98328d5d6 100644 --- a/mq/main/mqcomm-util/src/main/java/com/sun/messaging/jmq/util/CacheHashMap.java +++ b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/CacheHashMap.java @@ -16,7 +16,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.messaging.jmq.util; +package com.sun.messaging.jmq.jmsserver; import java.io.Serial; import java.util.LinkedHashMap; diff --git a/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Subscription.java b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Subscription.java index d6ab8c506..ffe480139 100644 --- a/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Subscription.java +++ b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Subscription.java @@ -25,6 +25,7 @@ import com.sun.messaging.jmq.util.lists.*; import com.sun.messaging.jmq.util.DestType; import com.sun.messaging.jmq.util.selector.*; +import com.sun.messaging.jmq.jmsserver.CacheHashMap; import com.sun.messaging.jmq.jmsserver.FaultInjection; import com.sun.messaging.jmq.jmsserver.util.BrokerException; import com.sun.messaging.jmq.jmsserver.util.PartitionNotFoundException; @@ -39,7 +40,6 @@ import com.sun.messaging.jmq.jmsserver.plugin.spi.SubscriptionSpi; import com.sun.messaging.jmq.jmsserver.persist.api.NoPersistPartitionedStoreImpl; import com.sun.messaging.jmq.jmsserver.persist.api.PartitionedStore; -import com.sun.messaging.jmq.util.CacheHashMap; import com.sun.messaging.jmq.jmsserver.service.ConnectionUID; diff --git a/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/data/handlers/TransactionHandler.java b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/data/handlers/TransactionHandler.java index 40a9c6059..83900fef3 100644 --- a/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/data/handlers/TransactionHandler.java +++ b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/data/handlers/TransactionHandler.java @@ -45,6 +45,7 @@ import com.sun.messaging.jmq.io.Status; import com.sun.messaging.jmq.io.SysMessageID; import com.sun.messaging.jmq.jmsserver.BrokerStateHandler; +import com.sun.messaging.jmq.jmsserver.CacheHashMap; import com.sun.messaging.jmq.jmsserver.FaultInjection; import com.sun.messaging.jmq.jmsserver.GlobalProperties; import com.sun.messaging.jmq.jmsserver.Globals; @@ -84,7 +85,6 @@ import com.sun.messaging.jmq.jmsserver.util.MaxConsecutiveRollbackException; import com.sun.messaging.jmq.jmsserver.util.lists.RemoveReason; import com.sun.messaging.jmq.jmsserver.data.handlers.admin.DebugHandler; -import com.sun.messaging.jmq.util.CacheHashMap; import com.sun.messaging.jmq.util.GoodbyeReason; import com.sun.messaging.jmq.util.JMQXid; import com.sun.messaging.jmq.util.UID; diff --git a/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/plugin/spi/ProducerSpi.java b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/plugin/spi/ProducerSpi.java index 514d9e49e..17716205c 100644 --- a/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/plugin/spi/ProducerSpi.java +++ b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/plugin/spi/ProducerSpi.java @@ -20,6 +20,7 @@ import java.util.*; import com.sun.messaging.jmq.util.log.*; +import com.sun.messaging.jmq.jmsserver.CacheHashMap; import com.sun.messaging.jmq.jmsserver.Globals; import com.sun.messaging.jmq.io.PacketType; import com.sun.messaging.jmq.io.Packet; @@ -28,7 +29,6 @@ import com.sun.messaging.jmq.jmsserver.core.DestinationUID; import com.sun.messaging.jmq.jmsserver.service.ConnectionUID; import com.sun.messaging.jmq.jmsserver.service.imq.IMQConnection; -import com.sun.messaging.jmq.util.CacheHashMap; @SuppressWarnings({"JdkObsolete", "ForEachIterable"}) public abstract class ProducerSpi {