Author: rgodfrey
Date: Tue Apr 30 13:40:02 2013
New Revision: 1477628
URL: http://svn.apache.org/r1477628
Log:
NO-JIRA : remove unused code from the Java Broker
Removed:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
Tue Apr 30 13:40:02 2013
@@ -1446,21 +1446,6 @@ public class AMQChannel implements AMQSe
return getProtocolSession().getVirtualHost();
}
- public int getChannel()
- {
- return getChannelId();
- }
-
- public boolean isDurable()
- {
- return false;
- }
-
- public long getCreateTime()
- {
- return _createTime;
- }
-
public void checkTransactionStatus(long openWarn, long openClose, long
idleWarn, long idleClose) throws AMQException
{
_transactionTimeoutHelper.checkIdleOrOpenTimes(_transaction, openWarn,
openClose, idleWarn, idleClose);
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
Tue Apr 30 13:40:02 2013
@@ -66,9 +66,6 @@ public abstract class AbstractServerMess
* Threadsafe. This will decrement the reference count and when it reaches
zero will remove the message from the
* message store.
*
- *
- * @throws org.apache.qpid.server.queue.MessageCleanupException when an
attempt was made to remove the message from the message store and that
- * failed
*/
public void decrementReference()
{
@@ -111,4 +108,4 @@ public abstract class AbstractServerMess
{
return _referenceCount;
}
-}
\ No newline at end of file
+}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
Tue Apr 30 13:40:02 2013
@@ -208,11 +208,8 @@ public class Message_1_0 implements Serv
/**
* Threadsafe. This will decrement the reference count and when it reaches
zero will remove the message from the
* message store.
- *
- *
- * @throws org.apache.qpid.server.queue.MessageCleanupException when an
attempt was made to remove the message from the message store and that
- * failed
*/
+
public void decrementReference()
{
int count = _refCountUpdater.decrementAndGet(this);
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
Tue Apr 30 13:40:02 2013
@@ -88,7 +88,6 @@ class Subscription_1_0 implements Subscr
private final AtomicReference<State> _state = new
AtomicReference<State>(State.SUSPENDED);
private final QueueEntry.SubscriptionAcquiredState _owningState = new
QueueEntry.SubscriptionAcquiredState(this);
- private final QueueEntry.SubscriptionAssignedState _assignedState = new
QueueEntry.SubscriptionAssignedState(this);
private final long _id;
private final boolean _acquires;
private volatile AMQQueue.Context _queueContext;
@@ -147,11 +146,6 @@ class Subscription_1_0 implements Subscr
return _owningState;
}
- public QueueEntry.SubscriptionAssignedState getAssignedState()
- {
- return _assignedState;
- }
-
public void setQueue(final AMQQueue queue, final boolean exclusive)
{
//TODO
@@ -162,11 +156,6 @@ class Subscription_1_0 implements Subscr
_noLocal = noLocal;
}
- public boolean isNoLocal()
- {
- return _noLocal;
- }
-
public long getSubscriptionID()
{
return _id;
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
Tue Apr 30 13:40:02 2013
@@ -164,38 +164,10 @@ public interface QueueEntry extends Comp
}
}
- public final class SubscriptionAssignedState extends EntryState
- {
- private final Subscription _subscription;
-
- public SubscriptionAssignedState(Subscription subscription)
- {
- _subscription = subscription;
- }
-
-
- public State getState()
- {
- return State.AVAILABLE;
- }
-
- public Subscription getSubscription()
- {
- return _subscription;
- }
-
-
- public String toString()
- {
- return "{" + getState().name() + " : " + _subscription +"}";
- }
- }
-
final static EntryState AVAILABLE_STATE = new AvailableState();
final static EntryState DELETED_STATE = new DeletedState();
final static EntryState DEQUEUED_STATE = new DequeuedState();
- final static EntryState EXPIRED_STATE = new ExpiredState();
final static EntryState NON_SUBSCRIPTION_ACQUIRED_STATE = new
NonSubscriptionAcquiredState();
@@ -225,10 +197,6 @@ public interface QueueEntry extends Comp
boolean isAcquiredBy(Subscription subscription);
void release();
- boolean releaseButRetain();
-
-
- boolean immediateAndNotDelivered();
void setRedelivered();
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
Tue Apr 30 13:40:02 2013
@@ -176,23 +176,6 @@ public abstract class QueueEntryImpl imp
{
boolean acquired = _stateUpdater.compareAndSet(this,AVAILABLE_STATE,
state);
- // deal with the case where the node has been assigned to a given
subscription already
- // including the case that the node is assigned to a closed
subscription
- if(!acquired)
- {
- if(state != NON_SUBSCRIPTION_ACQUIRED_STATE)
- {
- EntryState currentState = _state;
- if(currentState.getState() == State.AVAILABLE
- && ((currentState == AVAILABLE_STATE)
- ||
(((SubscriptionAcquiredState)state).getSubscription() ==
-
((SubscriptionAssignedState)currentState).getSubscription())
- ||
((SubscriptionAssignedState)currentState).getSubscription().isClosed() ))
- {
- acquired = _stateUpdater.compareAndSet(this,currentState,
state);
- }
- }
- }
if(acquired && _stateChangeListeners != null)
{
notifyStateChange(State.AVAILABLE, State.ACQUIRED);
@@ -258,41 +241,6 @@ public abstract class QueueEntryImpl imp
}
- public boolean releaseButRetain()
- {
- EntryState state = _state;
-
- boolean stateUpdated = false;
-
- if(state instanceof SubscriptionAcquiredState)
- {
- Subscription sub = ((SubscriptionAcquiredState)
state).getSubscription();
- if(_stateUpdater.compareAndSet(this, state,
sub.getAssignedState()))
- {
- getQueue().requeue(this);
- if(_stateChangeListeners != null)
- {
- notifyStateChange(QueueEntry.State.ACQUIRED,
QueueEntry.State.AVAILABLE);
- }
- stateUpdated = true;
- }
- }
-
- return stateUpdated;
-
- }
-
- public boolean immediateAndNotDelivered()
- {
- return !getDeliveredToConsumer() && isImmediate();
- }
-
- private boolean isImmediate()
- {
- final ServerMessage message = getMessage();
- return message != null && message.isImmediate();
- }
-
public void setRedelivered()
{
_deliveryState |= REDELIVERED;
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
Tue Apr 30 13:40:02 2013
@@ -181,7 +181,6 @@ public class SimpleAMQQueue implements A
//TODO : persist creation time
private long _createTime = System.currentTimeMillis();
- private AbstractConfiguration _queueConfiguration;
/** the maximum delivery count for each message on this queue or 0 if
maximum delivery count is not to be enforced. */
private int _maximumDeliveryCount;
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
Tue Apr 30 13:40:02 2013
@@ -57,8 +57,6 @@ public interface Subscription
AMQSessionModel getSessionModel();
QueueEntry.SubscriptionAcquiredState getOwningState();
- QueueEntry.SubscriptionAssignedState getAssignedState();
-
void setQueue(AMQQueue queue, boolean exclusive);
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
Tue Apr 30 13:40:02 2013
@@ -78,7 +78,6 @@ public abstract class SubscriptionImpl i
private final RecordDeliveryMethod _recordMethod;
private final QueueEntry.SubscriptionAcquiredState _owningState = new
QueueEntry.SubscriptionAcquiredState(this);
- private final QueueEntry.SubscriptionAssignedState _assignedState = new
QueueEntry.SubscriptionAssignedState(this);
private final Map<String, Object> _properties = new
ConcurrentHashMap<String, Object>();
@@ -707,12 +706,6 @@ public abstract class SubscriptionImpl i
return _owningState;
}
- public QueueEntry.SubscriptionAssignedState getAssignedState()
- {
- return _assignedState;
- }
-
-
public void confirmAutoClose()
{
ProtocolOutputConverter converter =
getChannel().getProtocolSession().getProtocolOutputConverter();
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
Tue Apr 30 13:40:02 2013
@@ -86,7 +86,6 @@ public class Subscription_0_10 implement
private final long _subscriptionID;
private final QueueEntry.SubscriptionAcquiredState _owningState = new
QueueEntry.SubscriptionAcquiredState(this);
- private final QueueEntry.SubscriptionAssignedState _assignedState = new
QueueEntry.SubscriptionAssignedState(this);
private static final Option[] BATCHED = new Option[] { Option.BATCH };
@@ -170,11 +169,6 @@ public class Subscription_0_10 implement
return _owningState;
}
- public QueueEntry.SubscriptionAssignedState getAssignedState()
- {
- return _assignedState;
- }
-
public void setQueue(AMQQueue queue, boolean exclusive)
{
if(getQueue() != null)
@@ -201,7 +195,7 @@ public class Subscription_0_10 implement
{
return _destination;
}
-
+
public boolean isSuspended()
{
return !isActive() || _deleted.get() || _session.isClosing(); // TODO
check for Session suspension
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
Tue Apr 30 13:40:02 2013
@@ -396,16 +396,6 @@ public class AbstractHeadersExchangeTest
}
- public boolean releaseButRetain()
- {
- return false;
- }
-
- public boolean immediateAndNotDelivered()
- {
- return false;
- }
-
public void setRedelivered()
{
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
Tue Apr 30 13:40:02 2013
@@ -88,7 +88,7 @@ public class MockQueueEntry implements Q
public boolean isAvailable()
{
- return false;
+ return false;
}
public Subscription getDeliveredSubscription()
@@ -116,11 +116,6 @@ public class MockQueueEntry implements Q
return 0;
}
- public boolean immediateAndNotDelivered()
- {
- return false;
- }
-
public boolean isAcquired()
{
return false;
@@ -159,11 +154,6 @@ public class MockQueueEntry implements Q
}
- public boolean releaseButRetain()
- {
- return false;
- }
-
public boolean removeStateChangeListener(StateChangeListener listener)
{
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java?rev=1477628&r1=1477627&r2=1477628&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
Tue Apr 30 13:40:02 2013
@@ -55,8 +55,6 @@ public class MockSubscription implements
private List<QueueEntry> _acceptEntries = null;
private final QueueEntry.SubscriptionAcquiredState _owningState = new
QueueEntry.SubscriptionAcquiredState(this);
- private final QueueEntry.SubscriptionAssignedState _assignedState = new
QueueEntry.SubscriptionAssignedState(this);
-
private static final AtomicLong idGenerator = new AtomicLong(0);
// Create a simple ID that increments for ever new Subscription
@@ -102,11 +100,6 @@ public class MockSubscription implements
return _owningState;
}
- public QueueEntry.SubscriptionAssignedState getAssignedState()
- {
- return _assignedState;
- }
-
public LogActor getLogActor()
{
return null; //To change body of implemented methods use File |
Settings | File Templates.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
