This is an automated email from the ASF dual-hosted git repository.
mattrpav pushed a commit to branch activemq-5.19.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.19.x by this push:
new 0240d92556 [AMQ-9656] Cleanup kahadb compiler warnings
0240d92556 is described below
commit 0240d92556454d9bd52bc4c0dc83c30175ce159c
Author: Matt Pavlovich <[email protected]>
AuthorDate: Mon Feb 3 17:15:19 2025 -0600
[AMQ-9656] Cleanup kahadb compiler warnings
(cherry picked from commit e6cec2773bd0a23fdfb16ee4709bab465969a712)
---
.../org/apache/activemq/store/kahadb/KahaDBStore.java | 18 +++++++++---------
.../store/kahadb/MultiKahaDBTransactionStore.java | 19 ++++++++++---------
.../store/kahadb/disk/journal/DataFileAccessor.java | 1 -
.../store/kahadb/disk/util/CommandLineSupport.java | 2 +-
.../activemq/store/kahadb/plist/PListStoreImpl.java | 2 --
.../main/java/org/apache/activemq/util/LFUCache.java | 2 +-
6 files changed, 21 insertions(+), 23 deletions(-)
diff --git
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
index 836e73f44e..26341b8b29 100644
---
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
+++
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
@@ -439,7 +439,7 @@ public class KahaDBStore extends MessageDatabase implements
PersistenceAdapter,
try {
for (MessageAck ack : acks) {
final String key = recoveredTxStateMapKey(destination,
ack);
- Set ackedAndPrepared = ackedAndPreparedMap.get(key);
+ Set<String> ackedAndPrepared =
ackedAndPreparedMap.get(key);
if (ackedAndPrepared == null) {
ackedAndPrepared = new LinkedHashSet<String>();
ackedAndPreparedMap.put(key, ackedAndPrepared);
@@ -458,7 +458,7 @@ public class KahaDBStore extends MessageDatabase implements
PersistenceAdapter,
for (MessageAck ack : acks) {
final String id =
ack.getLastMessageId().toProducerKey();
final String key = recoveredTxStateMapKey(destination,
ack);
- Set ackedAndPrepared = ackedAndPreparedMap.get(key);
+ Set<String> ackedAndPrepared =
ackedAndPreparedMap.get(key);
if (ackedAndPrepared != null) {
ackedAndPrepared.remove(id);
if (ackedAndPreparedMap.isEmpty()) {
@@ -466,7 +466,7 @@ public class KahaDBStore extends MessageDatabase implements
PersistenceAdapter,
}
}
if (rollback) {
- Set rolledBackAcks = rolledBackAcksMap.get(key);
+ Set<String> rolledBackAcks =
rolledBackAcksMap.get(key);
if (rolledBackAcks == null) {
rolledBackAcks = new LinkedHashSet<String>();
rolledBackAcksMap.put(key, rolledBackAcks);
@@ -686,7 +686,7 @@ public class KahaDBStore extends MessageDatabase implements
PersistenceAdapter,
for (Iterator<Entry<Long, MessageKeys>> iterator =
sd.orderIndex.iterator(tx); listener.hasSpace() && iterator
.hasNext(); ) {
Entry<Long, MessageKeys> entry = iterator.next();
- Set ackedAndPrepared =
ackedAndPreparedMap.get(destination.getPhysicalName());
+ Set<String> ackedAndPrepared =
ackedAndPreparedMap.get(destination.getPhysicalName());
if (ackedAndPrepared != null &&
ackedAndPrepared.contains(entry.getValue().messageId)) {
continue;
}
@@ -710,7 +710,7 @@ public class KahaDBStore extends MessageDatabase implements
PersistenceAdapter,
StoredDestination sd = getStoredDestination(dest, tx);
Entry<Long, MessageKeys> entry = null;
int counter =
recoverRolledBackAcks(destination.getPhysicalName(), sd, tx, maxReturned,
listener);
- Set ackedAndPrepared =
ackedAndPreparedMap.get(destination.getPhysicalName());
+ Set<String> ackedAndPrepared =
ackedAndPreparedMap.get(destination.getPhysicalName());
for (Iterator<Entry<Long, MessageKeys>> iterator =
sd.orderIndex.iterator(tx); iterator.hasNext(); ) {
entry = iterator.next();
if (ackedAndPrepared != null &&
ackedAndPrepared.contains(entry.getValue().messageId)) {
@@ -777,7 +777,7 @@ public class KahaDBStore extends MessageDatabase implements
PersistenceAdapter,
int counter = 0;
String id;
- Set rolledBackAcks = rolledBackAcksMap.get(recoveredTxStateMapKey);
+ Set<String> rolledBackAcks =
rolledBackAcksMap.get(recoveredTxStateMapKey);
if (rolledBackAcks == null) {
return counter;
}
@@ -916,7 +916,7 @@ public class KahaDBStore extends MessageDatabase implements
PersistenceAdapter,
return statistics;
}
});
- Set ackedAndPrepared =
ackedAndPreparedMap.get(destination.getPhysicalName());
+ Set<String> ackedAndPrepared =
ackedAndPreparedMap.get(destination.getPhysicalName());
if (ackedAndPrepared != null) {
recoveredStatistics.getMessageCount().subtract(ackedAndPrepared.size());
}
@@ -1203,7 +1203,7 @@ public class KahaDBStore extends MessageDatabase
implements PersistenceAdapter,
sd.orderIndex.setBatch(tx, cursorPos);
}
recoverRolledBackAcks(subscriptionKey, sd, tx,
Integer.MAX_VALUE, listener);
- Set ackedAndPrepared =
ackedAndPreparedMap.get(subscriptionKey);
+ Set<String> ackedAndPrepared =
ackedAndPreparedMap.get(subscriptionKey);
for (Iterator<Entry<Long, MessageKeys>> iterator =
sd.orderIndex.iterator(tx); iterator
.hasNext();) {
Entry<Long, MessageKeys> entry = iterator.next();
@@ -1263,7 +1263,7 @@ public class KahaDBStore extends MessageDatabase
implements PersistenceAdapter,
Entry<Long, MessageKeys> entry = null;
int counter = recoverRolledBackAcks(subscriptionKey,
sd, tx, maxReturned, listener);
- Set ackedAndPrepared =
ackedAndPreparedMap.get(subscriptionKey);
+ Set<String> ackedAndPrepared =
ackedAndPreparedMap.get(subscriptionKey);
for (Iterator<Entry<Long, MessageKeys>> iterator =
sd.orderIndex.iterator(tx, moc); iterator
.hasNext();) {
entry = iterator.next();
diff --git
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBTransactionStore.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBTransactionStore.java
index 00b5236b1f..987b20998d 100644
---
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBTransactionStore.java
+++
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBTransactionStore.java
@@ -427,15 +427,16 @@ public class MultiKahaDBTransactionStore implements
TransactionStore {
}
public JournalCommand<?> load(Location location) throws IOException {
- DataByteArrayInputStream is = new
DataByteArrayInputStream(journal.read(location));
- byte readByte = is.readByte();
- KahaEntryType type = KahaEntryType.valueOf(readByte);
- if (type == null) {
- throw new IOException("Could not load journal record. Invalid
location: " + location);
- }
- JournalCommand<?> message = (JournalCommand<?>) type.createMessage();
- message.mergeFramed(is);
- return message;
+ try(DataByteArrayInputStream is = new
DataByteArrayInputStream(journal.read(location))) {
+ byte readByte = is.readByte();
+ KahaEntryType type = KahaEntryType.valueOf(readByte);
+ if (type == null) {
+ throw new IOException("Could not load journal record. Invalid
location: " + location);
+ }
+ JournalCommand<?> message = (JournalCommand<?>)
type.createMessage();
+ message.mergeFramed(is);
+ return message;
+ }
}
public void process(final Location location, JournalCommand<?> command)
throws IOException {
diff --git
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java
index dbe151d507..80bf636499 100644
---
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java
+++
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java
@@ -19,7 +19,6 @@ package org.apache.activemq.store.kahadb.disk.journal;
import java.io.IOException;
import java.util.Map;
-import java.util.Objects;
import org.apache.activemq.util.ByteSequence;
import org.apache.activemq.util.RecoverableRandomAccessFile;
import org.slf4j.Logger;
diff --git
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/util/CommandLineSupport.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/util/CommandLineSupport.java
index ad5771c38b..d141684861 100644
---
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/util/CommandLineSupport.java
+++
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/util/CommandLineSupport.java
@@ -48,7 +48,7 @@ public class CommandLineSupport {
* @return any arguments that are not valid options for the target
*/
static public String[] setOptions(Object target, String []args) {
- ArrayList rc = new ArrayList();
+ ArrayList<String> rc = new ArrayList<>();
for (int i = 0; i < args.length; i++) {
if( args[i] == null )
diff --git
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/plist/PListStoreImpl.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/plist/PListStoreImpl.java
index cce93f21dc..f80235226a 100644
---
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/plist/PListStoreImpl.java
+++
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/plist/PListStoreImpl.java
@@ -18,7 +18,6 @@ package org.apache.activemq.store.kahadb.plist;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerServiceAware;
-import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.store.JournaledStore;
import org.apache.activemq.store.PList;
import org.apache.activemq.store.PListStore;
@@ -32,7 +31,6 @@ import
org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
import org.apache.activemq.thread.Scheduler;
import org.apache.activemq.util.*;
-import org.apache.activemq.wireformat.WireFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/activemq-kahadb-store/src/main/java/org/apache/activemq/util/LFUCache.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/util/LFUCache.java
index 3cd0aecc11..db9e8087db 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/util/LFUCache.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/util/LFUCache.java
@@ -75,7 +75,7 @@ public class LFUCache<Key, Value> implements Map<Key, Value> {
doEviction();
}
LinkedHashSet<CacheNode<Key, Value>> nodes = frequencyList[0];
- currentNode = new CacheNode(k, v, 0);
+ currentNode = new CacheNode<>(k, v, 0);
nodes.add(currentNode);
cache.put(k, currentNode);
lowestFrequency = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
