From c0090f6f0c94b502d8043ffaea20b57500188156 Mon Sep 17 00:00:00 2001 From: Claus Ibsen Date: Fri, 22 Nov 2013 11:21:42 +0100 Subject: [PATCH] AMQ-4885: Renamed some API methods in MessageStore due typos. --- .../main/java/org/apache/activemq/broker/region/Topic.java | 2 +- .../src/main/java/org/apache/activemq/store/MessageStore.java | 4 ++-- .../org/apache/activemq/store/ProxyTopicMessageStore.java | 4 ++-- .../java/org/apache/activemq/store/TopicMessageStore.java | 2 +- .../apache/activemq/store/memory/MemoryTopicMessageStore.java | 2 +- .../org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java | 2 +- .../activemq/store/journal/JournalTopicMessageStore.java | 4 ++-- .../java/org/apache/activemq/store/kahadb/KahaDBStore.java | 4 ++-- .../org/apache/activemq/store/kahadb/TempKahaDBStore.java | 4 ++-- .../main/scala/org/apache/activemq/leveldb/LevelDBStore.scala | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java index 328410c08b..41eef60484 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java @@ -255,7 +255,7 @@ public class Topic extends BaseDestination implements Task { // This destination might be a pattern synchronized (consumers) { consumers.add(subscription); - topicStore.addSubsciption(info, subscription.getConsumerInfo().isRetroactive()); + topicStore.addSubscription(info, subscription.getConsumerInfo().isRetroactive()); } } diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java index b519718341..6dac804ab9 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java +++ b/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java @@ -147,10 +147,10 @@ public interface MessageStore extends Service { ActiveMQDestination getDestination(); /** - * @param memoeyUSage The SystemUsage that is controlling the + * @param memoryUsage The SystemUsage that is controlling the * destination's memory usage. */ - void setMemoryUsage(MemoryUsage memoeyUSage); + void setMemoryUsage(MemoryUsage memoryUsage); /** * @return the number of messages ready to deliver diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java index 00e51501af..8487650291 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java +++ b/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java @@ -94,8 +94,8 @@ public class ProxyTopicMessageStore implements TopicMessageStore { } @Override - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { - delegate.addSubsciption(subscriptionInfo, retroactive); + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + delegate.addSubscription(subscriptionInfo, retroactive); } @Override diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java index 24f5b0cc16..0343c11e9d 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java +++ b/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java @@ -129,5 +129,5 @@ public interface TopicMessageStore extends MessageStore { * @param retroactive * @throws IOException */ - void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException; + void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException; } diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java index 023d9eb294..0debfe6555 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java +++ b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java @@ -80,7 +80,7 @@ public class MemoryTopicMessageStore extends MemoryMessageStore implements Topic return subscriberDatabase.get(new SubscriptionKey(clientId, subscriptionName)); } - public synchronized void addSubsciption(SubscriptionInfo info, boolean retroactive) throws IOException { + public synchronized void addSubscription(SubscriptionInfo info, boolean retroactive) throws IOException { SubscriptionKey key = new SubscriptionKey(info); MemoryTopicSub sub = new MemoryTopicSub(); topicSubMap.put(key, sub); diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java index 8d38234d19..1efdc63ce5 100755 --- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java +++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java @@ -330,7 +330,7 @@ public class JDBCTopicMessageStore extends JDBCMessageStore implements TopicMess } - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { TransactionContext c = persistenceAdapter.getTransactionContext(); try { c = persistenceAdapter.getTransactionContext(); diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java index 64964fba92..51d9693209 100755 --- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java +++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java @@ -71,9 +71,9 @@ public class JournalTopicMessageStore extends JournalMessageStore implements Top return longTermStore.lookupSubscription(clientId, subscriptionName); } - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { this.peristenceAdapter.checkpoint(true, true); - longTermStore.addSubsciption(subscriptionInfo, retroactive); + longTermStore.addSubscription(subscriptionInfo, retroactive); } public void addMessage(ConnectionContext context, Message message) throws IOException { 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 0c269b4fd6..3095a0dd35 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 @@ -662,7 +662,7 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter { } @Override - public void setMemoryUsage(MemoryUsage memoeyUSage) { + public void setMemoryUsage(MemoryUsage memoryUsage) { } @Override public void start() throws Exception { @@ -765,7 +765,7 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter { } @Override - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { String subscriptionKey = subscriptionKey(subscriptionInfo.getClientId(), subscriptionInfo .getSubscriptionName()); KahaSubscriptionCommand command = new KahaSubscriptionCommand(); diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java index b68972e1b7..66ae4960f0 100644 --- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java +++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java @@ -265,7 +265,7 @@ public class TempKahaDBStore extends TempMessageDatabase implements PersistenceA } @Override - public void setMemoryUsage(MemoryUsage memoeyUSage) { + public void setMemoryUsage(MemoryUsage memoryUsage) { } @Override public void start() throws Exception { @@ -294,7 +294,7 @@ public class TempKahaDBStore extends TempMessageDatabase implements PersistenceA processRemove(command, null); } - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { String subscriptionKey = subscriptionKey(subscriptionInfo.getClientId(), subscriptionInfo.getSubscriptionName()); KahaSubscriptionCommand command = new KahaSubscriptionCommand(); command.setDestination(dest); diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala index 7f5b534f12..322656f72b 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala @@ -816,7 +816,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P } } - def addSubsciption(info: SubscriptionInfo, retroactive: Boolean) = { + def addSubscription(info: SubscriptionInfo, retroactive: Boolean) = { check_running var sub = db.addSubscription(key, info) subscriptions.synchronized {