Author: rgodfrey
Date: Mon Apr 28 15:45:08 2014
New Revision: 1590686
URL: http://svn.apache.org/r1590686
Log:
QPID-5679 : Address review comments from Alex Rudyy
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1590686&r1=1590685&r2=1590686&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Mon Apr 28 15:45:08 2014
@@ -514,8 +514,7 @@ public abstract class AbstractConfigured
}
}
- public void
- validate()
+ public void validate()
{
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java?rev=1590686&r1=1590685&r2=1590686&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
Mon Apr 28 15:45:08 2014
@@ -46,43 +46,24 @@ public interface AMQQueue<X extends AMQQ
void removeBinding(BindingImpl binding);
+ @Override
Collection<BindingImpl> getBindings();
- int getBindingCount();
-
LogSubject getLogSubject();
- long getUnacknowledgedBytes();
-
- long getTotalDequeuedMessages();
-
- long getTotalEnqueuedMessages();
-
VirtualHostImpl getVirtualHost();
+ @Override
public Collection<QueueConsumer<?>> getConsumers();
- int getConsumerCount();
-
- int getConsumerCountWithCredit();
-
- boolean hasExclusiveConsumer();
-
boolean isUnused();
boolean isEmpty();
- int getQueueDepthMessages();
-
-
- long getQueueDepthBytes();
-
long getOldestMessageArrivalTime();
boolean isDeleted();
- int delete();
-
void requeue(QueueEntry entry);
void dequeue(QueueEntry entry);
@@ -110,8 +91,6 @@ public interface AMQQueue<X extends AMQQ
*/
public List<? extends QueueEntry> getMessagesRangeOnTheQueue(final long
fromPosition, final long toPosition);
- void visit(QueueEntryVisitor visitor);
-
long clearQueue();
/**
@@ -126,39 +105,8 @@ public interface AMQQueue<X extends AMQQ
void stop();
Collection<String> getAvailableAttributes();
- Object getAttribute(String attrName);
-
- /**
- * Gets the maximum delivery count. If a message on this queue
- * is delivered more than maximumDeliveryCount, the message will be
- * routed to the {@link #getAlternateExchange()} (if set), or otherwise
- * discarded. 0 indicates that maximum deliver count should not be
enforced.
- *
- * @return maximum delivery count
- */
- int getMaximumDeliveryAttempts();
-
- /**
- * Sets the maximum delivery count.
- *
- * @param maximumDeliveryCount maximum delivery count
- */
- public void setMaximumDeliveryAttempts(final int maximumDeliveryCount);
void setNotificationListener(QueueNotificationListener listener);
- long getPersistentDequeuedBytes();
-
- long getPersistentDequeuedMessages();
-
- long getPersistentEnqueuedBytes();
-
- long getPersistentEnqueuedMessages();
-
- long getTotalDequeuedBytes();
-
- long getTotalEnqueuedBytes();
-
- long getUnacknowledgedMessages();
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1590686&r1=1590685&r2=1590686&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Mon Apr 28 15:45:08 2014
@@ -171,7 +171,7 @@ public abstract class AbstractQueue<X ex
@ManagedAttributeField
private ExclusivityPolicy _exclusive;
- private Object _exclusiveOwner; // could be connection, session or
Principal
+ private Object _exclusiveOwner; // could be connection, session, Principal
or a String for the container name
private final Set<NotificationCheck> _notificationChecks =
Collections.synchronizedSet(EnumSet.noneOf(NotificationCheck.class));
@@ -245,6 +245,16 @@ public abstract class AbstractQueue<X ex
}
}
+ @Override
+ public void validate()
+ {
+ super.validate();
+ if (_queueFlowResumeSizeBytes > _queueFlowControlSizeBytes)
+ {
+ throw new IllegalConfigurationException("Flow resume size can't be
greater than flow control size");
+ }
+ }
+
protected void onOpen()
{
super.onOpen();
@@ -360,11 +370,6 @@ public abstract class AbstractQueue<X ex
}
- if (_queueFlowResumeSizeBytes > _queueFlowControlSizeBytes)
- {
- throw new IllegalConfigurationException("Flow resume size can't be
greater than flow control size");
- }
-
// Log the creation of this Queue.
// The priorities display is toggled on if we set priorities > 0
getEventLogger().message(_logSubject,
@@ -1256,7 +1261,7 @@ public abstract class AbstractQueue<X ex
return _atomicQueueSize;
}
- public boolean hasExclusiveConsumer()
+ private boolean hasExclusiveConsumer()
{
return _exclusiveSubscriber != null;
}
@@ -2207,11 +2212,6 @@ public abstract class AbstractQueue<X ex
return _maximumDeliveryAttempts;
}
- public void setMaximumDeliveryAttempts(final int maximumDeliveryAttempts)
- {
- _maximumDeliveryAttempts = maximumDeliveryAttempts;
- }
-
/**
* Checks if there is any notification to send to the listeners
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
