diff options
Diffstat (limited to 'java/broker/src/main/java/org/apache/qpid/server/subscription')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java | 40 | ||||
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java | 37 |
2 files changed, 2 insertions, 75 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java b/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java index c92853e400..6c5cb2e721 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java +++ b/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java @@ -27,11 +27,6 @@ import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.server.AMQChannel; -import org.apache.qpid.server.configuration.ConfigStore; -import org.apache.qpid.server.configuration.ConfiguredObject; -import org.apache.qpid.server.configuration.SessionConfig; -import org.apache.qpid.server.configuration.SubscriptionConfig; -import org.apache.qpid.server.configuration.SubscriptionConfigType; import org.apache.qpid.server.filter.FilterManager; import org.apache.qpid.server.filter.FilterManagerFactory; import org.apache.qpid.server.flow.FlowCreditManager; @@ -61,8 +56,7 @@ import java.util.concurrent.locks.ReentrantLock; * Encapsulation of a supscription to a queue. <p/> Ties together the protocol session of a subscriber, the consumer tag * that was given out by the broker and the channel id. <p/> */ -public abstract class SubscriptionImpl implements Subscription, FlowCreditManager.FlowCreditManagerListener, - SubscriptionConfig +public abstract class SubscriptionImpl implements Subscription, FlowCreditManager.FlowCreditManagerListener { private StateListener _stateListener = new StateListener() @@ -91,7 +85,6 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage private final long _subscriptionID; private LogSubject _logSubject; private LogActor _logActor; - private UUID _qmfId; private final AtomicLong _deliveredCount = new AtomicLong(0); private final AtomicLong _deliveredBytes = new AtomicLong(0); @@ -373,11 +366,6 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage return _channel; } - public ConfigStore getConfigStore() - { - return getQueue().getConfigStore(); - } - public Long getDelivered() { return _deliveredCount.get(); @@ -391,9 +379,6 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage } _queue = queue; - _qmfId = getConfigStore().createId(); - getConfigStore().addConfiguredObject(this); - _logSubject = new SubscriptionLogSubject(this); _logActor = new SubscriptionActor(CurrentActor.get().getRootMessageLogger(), this); @@ -547,8 +532,6 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage { _stateChangeLock.unlock(); } - getConfigStore().removeConfiguredObject(this); - //Log Subscription closed CurrentActor.get().message(_logSubject, SubscriptionMessages.CLOSE()); } @@ -752,11 +735,6 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage return "WINDOW"; } - public SessionConfig getSessionConfig() - { - return getChannel(); - } - public boolean isBrowsing() { return isBrowser(); @@ -767,32 +745,16 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage return true; } - @Override - public UUID getQMFId() - { - return _qmfId; - } - public boolean isDurable() { return false; } - public SubscriptionConfigType getConfigType() - { - return SubscriptionConfigType.getInstance(); - } - public boolean isExclusive() { return getQueue().hasExclusiveSubscriber(); } - public ConfiguredObject getParent() - { - return getSessionConfig(); - } - public String getName() { return String.valueOf(_consumerTag); diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java index dfd9315226..b9bba49fab 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java +++ b/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java @@ -24,11 +24,6 @@ import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicContentHeaderProperties; import org.apache.qpid.framing.FieldTable; -import org.apache.qpid.server.configuration.ConfigStore; -import org.apache.qpid.server.configuration.ConfiguredObject; -import org.apache.qpid.server.configuration.SessionConfig; -import org.apache.qpid.server.configuration.SubscriptionConfig; -import org.apache.qpid.server.configuration.SubscriptionConfigType; import org.apache.qpid.server.exchange.Exchange; import org.apache.qpid.server.filter.FilterManager; import org.apache.qpid.server.flow.CreditCreditManager; @@ -86,7 +81,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCreditManagerListener, SubscriptionConfig, LogSubject +public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCreditManagerListener, LogSubject { private final long _subscriptionID; @@ -125,7 +120,6 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr private LogActor _logActor; private final Map<String, Object> _properties = new ConcurrentHashMap<String, Object>(); - private UUID _qmfId; private String _traceExclude; private String _trace; private final long _createTime = System.currentTimeMillis(); @@ -192,8 +186,6 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr Map<String, Object> arguments = queue.getArguments(); _traceExclude = (String) arguments.get("qpid.trace.exclude"); _trace = (String) arguments.get("qpid.trace.id"); - _qmfId = getConfigStore().createId(); - getConfigStore().addConfiguredObject(this); String filterLogString = null; _logActor = GenericActor.getInstance(this); @@ -283,7 +275,6 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr } } _creditManager.removeListener(this); - getConfigStore().removeConfiguredObject(this); CurrentActor.get().message(getLogSubject(), SubscriptionMessages.CLOSE()); } finally @@ -295,11 +286,6 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr } - public ConfigStore getConfigStore() - { - return getQueue().getConfigStore(); - } - public Long getDelivered() { return _deliveredCount.get(); @@ -970,12 +956,6 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr return _session; } - - public SessionConfig getSessionConfig() - { - return getSessionModel(); - } - public boolean isBrowsing() { return _acquireMode == MessageAcquireMode.NOT_ACQUIRED; @@ -986,20 +966,11 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr return getQueue().hasExclusiveSubscriber(); } - public ConfiguredObject getParent() - { - return getSessionConfig(); - } - public boolean isDurable() { return false; } - public SubscriptionConfigType getConfigType() - { - return SubscriptionConfigType.getInstance(); - } public boolean isExplicitAcknowledge() { @@ -1011,12 +982,6 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr return _flowMode.toString(); } - @Override - public UUID getQMFId() - { - return _qmfId; - } - public String getName() { return _destination; |