You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/02/27 00:27:43 UTC
svn commit: r1572343 [2/7] - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/binding/
broker-core/src/main/java/org/apache/qpid/server/consumer/
broker-core/src/main/java/org/apache/qpid/server/exchange/
broker-core/src/main/...
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java Wed Feb 26 23:27:39 2014
@@ -22,7 +22,7 @@ package org.apache.qpid.server.exchange;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.filter.Filterable;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
@@ -71,8 +71,8 @@ public class HeadersExchange extends Abs
private static final Logger _logger = Logger.getLogger(HeadersExchange.class);
- private final ConcurrentHashMap<String, CopyOnWriteArraySet<Binding>> _bindingsByKey =
- new ConcurrentHashMap<String, CopyOnWriteArraySet<Binding>>();
+ private final ConcurrentHashMap<String, CopyOnWriteArraySet<BindingImpl>> _bindingsByKey =
+ new ConcurrentHashMap<String, CopyOnWriteArraySet<BindingImpl>>();
private final CopyOnWriteArrayList<HeadersBinding> _bindingHeaderMatchers =
new CopyOnWriteArrayList<HeadersBinding>();
@@ -106,7 +106,7 @@ public class HeadersExchange extends Abs
{
if (hb.matches(Filterable.Factory.newInstance(payload,instanceProperties)))
{
- Binding b = hb.getBinding();
+ BindingImpl b = hb.getBinding();
b.incrementMatches();
@@ -122,7 +122,7 @@ public class HeadersExchange extends Abs
return new ArrayList<BaseQueue>(queues);
}
- protected void onBind(final Binding binding)
+ protected void onBind(final BindingImpl binding)
{
String bindingKey = binding.getBindingKey();
AMQQueue queue = binding.getAMQQueue();
@@ -131,12 +131,12 @@ public class HeadersExchange extends Abs
assert queue != null;
assert bindingKey != null;
- CopyOnWriteArraySet<Binding> bindings = _bindingsByKey.get(bindingKey);
+ CopyOnWriteArraySet<BindingImpl> bindings = _bindingsByKey.get(bindingKey);
if(bindings == null)
{
- bindings = new CopyOnWriteArraySet<Binding>();
- CopyOnWriteArraySet<Binding> newBindings;
+ bindings = new CopyOnWriteArraySet<BindingImpl>();
+ CopyOnWriteArraySet<BindingImpl> newBindings;
if((newBindings = _bindingsByKey.putIfAbsent(bindingKey, bindings)) != null)
{
bindings = newBindings;
@@ -154,11 +154,11 @@ public class HeadersExchange extends Abs
}
- protected void onUnbind(final Binding binding)
+ protected void onUnbind(final BindingImpl binding)
{
assert binding != null;
- CopyOnWriteArraySet<Binding> bindings = _bindingsByKey.get(binding.getBindingKey());
+ CopyOnWriteArraySet<BindingImpl> bindings = _bindingsByKey.get(binding.getBindingKey());
if(bindings != null)
{
bindings.remove(binding);
Added: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/NonDefaultExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/NonDefaultExchange.java?rev=1572343&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/NonDefaultExchange.java (added)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/NonDefaultExchange.java Wed Feb 26 23:27:39 2014
@@ -0,0 +1,32 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.exchange;
+
+import org.apache.qpid.server.binding.BindingImpl;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.queue.AMQQueue;
+
+public interface NonDefaultExchange<T extends NonDefaultExchange<T>> extends Exchange<T>, ExchangeImpl<T>
+{
+ NonDefaultExchange getAlternateExchange();
+
+ BindingImpl getBinding(String bindingName, AMQQueue queue);
+}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java Wed Feb 26 23:27:39 2014
@@ -28,7 +28,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.exchange.topic.TopicExchangeResult;
import org.apache.qpid.server.exchange.topic.TopicMatcherResult;
import org.apache.qpid.server.exchange.topic.TopicNormalizer;
@@ -57,7 +57,7 @@ public class TopicExchange extends Abstr
private final Map<String, TopicExchangeResult> _topicExchangeResults =
new ConcurrentHashMap<String, TopicExchangeResult>();
- private final Map<Binding, Map<String,Object>> _bindings = new HashMap<Binding, Map<String,Object>>();
+ private final Map<BindingImpl, Map<String,Object>> _bindings = new HashMap<BindingImpl, Map<String,Object>>();
public TopicExchange(final VirtualHost vhost, final Map attributes) throws UnknownExchangeException
{
@@ -70,7 +70,7 @@ public class TopicExchange extends Abstr
return TYPE;
}
- protected synchronized void registerQueue(final Binding binding) throws AMQInvalidArgumentException
+ protected synchronized void registerQueue(final BindingImpl binding) throws AMQInvalidArgumentException
{
final String bindingKey = binding.getBindingKey();
AMQQueue queue = binding.getAMQQueue();
@@ -188,7 +188,7 @@ public class TopicExchange extends Abstr
}
- private boolean deregisterQueue(final Binding binding)
+ private boolean deregisterQueue(final BindingImpl binding)
{
if(_bindings.containsKey(binding))
{
@@ -240,7 +240,7 @@ public class TopicExchange extends Abstr
{
TopicExchangeResult res = (TopicExchangeResult)result;
- for(Binding b : res.getBindings())
+ for(BindingImpl b : res.getBindings())
{
b.incrementMatches();
}
@@ -253,7 +253,7 @@ public class TopicExchange extends Abstr
}
- protected void onBind(final Binding binding)
+ protected void onBind(final BindingImpl binding)
{
try
{
@@ -266,7 +266,7 @@ public class TopicExchange extends Abstr
}
}
- protected void onUnbind(final Binding binding)
+ protected void onUnbind(final BindingImpl binding)
{
deregisterQueue(binding);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.exchange.topic;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.filter.Filterable;
import org.apache.qpid.server.filter.MessageFilter;
import org.apache.qpid.server.queue.AMQQueue;
@@ -36,7 +36,7 @@ import java.util.concurrent.CopyOnWriteA
public final class TopicExchangeResult implements TopicMatcherResult
{
- private final List<Binding> _bindings = new CopyOnWriteArrayList<Binding>();
+ private final List<BindingImpl> _bindings = new CopyOnWriteArrayList<BindingImpl>();
private final Map<AMQQueue, Integer> _unfilteredQueues = new ConcurrentHashMap<AMQQueue, Integer>();
private final ConcurrentHashMap<AMQQueue, Map<MessageFilter,Integer>> _filteredQueues = new ConcurrentHashMap<AMQQueue, Map<MessageFilter, Integer>>();
private volatile ArrayList<AMQQueue> _unfilteredQueueList = new ArrayList<AMQQueue>(0);
@@ -80,19 +80,19 @@ public final class TopicExchangeResult i
return _unfilteredQueues.keySet();
}
- public void addBinding(Binding binding)
+ public void addBinding(BindingImpl binding)
{
_bindings.add(binding);
}
- public void removeBinding(Binding binding)
+ public void removeBinding(BindingImpl binding)
{
_bindings.remove(binding);
}
- public List<Binding> getBindings()
+ public List<BindingImpl> getBindings()
{
- return new ArrayList<Binding>(_bindings);
+ return new ArrayList<BindingImpl>(_bindings);
}
public void addFilteredQueue(AMQQueue queue, MessageFilter filter)
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java Wed Feb 26 23:27:39 2014
@@ -122,7 +122,7 @@ public class FilterSupport
public static final class NoLocalFilter implements MessageFilter
{
- private final MessageSource<?,?> _queue;
+ private final MessageSource _queue;
private NoLocalFilter(MessageSource queue)
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.queue.AMQQueue;
import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.BINDING_FORMAT;
@@ -37,7 +37,7 @@ public class BindingLogSubject extends A
* @param exchange
* @param queue
*/
- public BindingLogSubject(String routingKey, Exchange exchange,
+ public BindingLogSubject(String routingKey, ExchangeImpl exchange,
AMQQueue queue)
{
setLogStringWithFormat(BINDING_FORMAT,
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.virtualhost.VirtualHost;
import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.EXCHANGE_FORMAT;
@@ -29,7 +29,7 @@ public class ExchangeLogSubject extends
{
/** Create an ExchangeLogSubject that Logs in the following format. */
- public ExchangeLogSubject(Exchange exchange, VirtualHost vhost)
+ public ExchangeLogSubject(ExchangeImpl exchange, VirtualHost vhost)
{
setLogStringWithFormat(EXCHANGE_FORMAT, vhost.getName(),
exchange.getExchangeType().getType(), exchange.getName());
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java Wed Feb 26 23:27:39 2014
@@ -41,5 +41,5 @@ public interface MessageDestination exte
<M extends ServerMessage<? extends StorableMessageMetaData>> int send(M message,
InstanceProperties instanceProperties,
ServerTransaction txn,
- Action<? super MessageInstance<?,? extends Consumer>> postEnqueueAction);
+ Action<? super MessageInstance> postEnqueueAction);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java Wed Feb 26 23:27:39 2014
@@ -22,13 +22,14 @@ package org.apache.qpid.server.message;
import org.apache.qpid.server.filter.Filterable;
+import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.consumer.Consumer;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.StateChangeListener;
-public interface MessageInstance<M extends MessageInstance<M,C>, C extends Consumer>
+public interface MessageInstance
{
@@ -43,33 +44,33 @@ public interface MessageInstance<M exten
void decrementDeliveryCount();
- void addStateChangeListener(StateChangeListener<? super M,State> listener);
+ void addStateChangeListener(StateChangeListener<? super MessageInstance,State> listener);
- boolean removeStateChangeListener(StateChangeListener<? super M, State> listener);
+ boolean removeStateChangeListener(StateChangeListener<? super MessageInstance, State> listener);
boolean acquiredByConsumer();
- boolean isAcquiredBy(C consumer);
+ boolean isAcquiredBy(Consumer consumer);
void setRedelivered();
boolean isRedelivered();
- C getDeliveredConsumer();
+ Consumer getDeliveredConsumer();
void reject();
- boolean isRejectedBy(C consumer);
+ boolean isRejectedBy(Consumer consumer);
boolean getDeliveredToConsumer();
boolean expired();
- boolean acquire(C sub);
+ boolean acquire(Consumer sub);
int getMaximumDeliveryCount();
- int routeToAlternate(Action<? super MessageInstance<?, ? extends Consumer>> action, ServerTransaction txn);
+ int routeToAlternate(Action<? super MessageInstance> action, ServerTransaction txn);
Filterable asFilterable();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java Wed Feb 26 23:27:39 2014
@@ -29,23 +29,23 @@ import org.apache.qpid.server.store.Tran
import java.util.Collection;
import java.util.EnumSet;
-public interface MessageSource<C extends Consumer, S extends MessageSource<C,S>> extends TransactionLogResource, MessageNode
+public interface MessageSource extends TransactionLogResource, MessageNode
{
- <T extends ConsumerTarget> C addConsumer(T target, FilterManager filters,
+ Consumer addConsumer(ConsumerTarget target, FilterManager filters,
Class<? extends ServerMessage> messageClass,
String consumerName, EnumSet<Consumer.Option> options)
throws ExistingExclusiveConsumer, ExistingConsumerPreventsExclusive,
ConsumerAccessRefused;
- Collection<C> getConsumers();
+ Collection<? extends Consumer> getConsumers();
- void addConsumerRegistrationListener(ConsumerRegistrationListener<S> listener);
+ void addConsumerRegistrationListener(ConsumerRegistrationListener<? super MessageSource> listener);
- void removeConsumerRegistrationListener(ConsumerRegistrationListener<S> listener);
+ void removeConsumerRegistrationListener(ConsumerRegistrationListener<? super MessageSource> listener);
boolean verifySessionAccess(AMQSessionModel<?,?> session);
- interface ConsumerRegistrationListener<Q extends MessageSource<? extends Consumer,?>>
+ interface ConsumerRegistrationListener<Q extends MessageSource>
{
void consumerAdded(Q source, Consumer consumer);
void consumerRemoved(Q queue, Consumer consumer);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java Wed Feb 26 23:27:39 2014
@@ -28,10 +28,8 @@ import org.apache.qpid.server.security.A
public interface AccessControlProvider<X extends AccessControlProvider<X>> extends ConfiguredObject<X>
{
- public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
- public static final String TIME_TO_LIVE = "timeToLive";
public static final String TYPE = "type";
//retrieve the underlying AccessControl object
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java Wed Feb 26 23:27:39 2014
@@ -30,10 +30,8 @@ public interface AuthenticationProvider<
{
public static final String DESCRIPTION = "description";
- public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
- public static final String TIME_TO_LIVE = "timeToLive";
//children
Collection<VirtualHostAlias> getVirtualHostPortBindings();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java Wed Feb 26 23:27:39 2014
@@ -28,18 +28,6 @@ import java.util.Map;
public interface Binding<X extends Binding<X>> extends ConfiguredObject<X>
{
- public String MATCHED_BYTES = "matchedBytes";
- public String MATCHED_MESSAGES = "matchedMessages";
- public String STATE_CHANGED = "stateChanged";
-
- public static final Collection<String> AVAILABLE_STATISTICS =
- Collections.unmodifiableCollection(
- Arrays.asList(
- MATCHED_BYTES,
- MATCHED_MESSAGES,
- STATE_CHANGED));
-
-
public String ARGUMENTS = "arguments";
public String DURABLE = "durable";
public String LIFETIME_POLICY = "lifetimePolicy";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Wed Feb 26 23:27:39 2014
@@ -47,8 +47,6 @@ public interface Broker<X extends Broker
String SUPPORTED_PREFERENCES_PROVIDER_TYPES = "supportedPreferencesProviderTypes";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
- String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
String DEFAULT_VIRTUAL_HOST = "defaultVirtualHost";
String STATISTICS_REPORTING_PERIOD = "statisticsReportingPeriod";
String STATISTICS_REPORTING_RESET_ENABLED = "statisticsReportingResetEnabled";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java Wed Feb 26 23:27:39 2014
@@ -39,6 +39,7 @@ public interface ConfiguredObject<X exte
public static final String DESCRIPTION = "description";
public static final String LAST_UPDATED_BY = "lastUpdatedBy";
public static final String LAST_UPDATED_TIME = "lastUpdatedTime";
+ public static final String STATE = "state";
public static final String CREATED_BY = "createdBy";
public static final String CREATED_TIME = "createdTime";
@@ -204,28 +205,6 @@ public interface ConfiguredObject<X exte
IllegalArgumentException;
/**
- * Get the time the object will live once the lifetime policy conditions are no longer fulfilled
- *
- * @return the time to live
- */
- @ManagedAttribute
- long getTimeToLive();
-
- /**
- * Set the ttl value
- *
- * @param expected the ttl the caller believes the object currently has
- * @param desired the ttl value the caller
- * @return the new ttl value
- * @throws IllegalStateException if the ttl cannot be set in the current state
- * @throws AccessControlException if the caller does not have permission to change the ttl
- * @throws IllegalArgumentException if the object does not support the requested ttl value
- */
- long setTimeToLive(long expected, long desired) throws IllegalStateException,
- AccessControlException,
- IllegalArgumentException;
-
- /**
* Get the names of attributes that are set on this object
*
* Note that the returned collection is correct at the time the method is called, but will not reflect future
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java Wed Feb 26 23:27:39 2014
@@ -31,7 +31,6 @@ public interface Connection<X extends Co
public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
- public static final String TIME_TO_LIVE = "timeToLive";
public static final String CLIENT_ID = "clientId";
public static final String CLIENT_VERSION = "clientVersion";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java Wed Feb 26 23:27:39 2014
@@ -34,7 +34,6 @@ public interface Consumer<X extends Cons
public String DURABLE = "durable";
public String LIFETIME_POLICY = "lifetimePolicy";
public String STATE = "state";
- public String TIME_TO_LIVE = "timeToLive";
@ManagedAttribute
String getDistributionMode();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java Wed Feb 26 23:27:39 2014
@@ -32,7 +32,6 @@ public interface Exchange<X extends Exch
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
String ALTERNATE_EXCHANGE = "alternateExchange";
// Attributes
@@ -41,7 +40,7 @@ public interface Exchange<X extends Exch
Exchange<?> getAlternateExchange();
//children
- Collection<Binding> getBindings();
+ Collection<? extends Binding> getBindings();
Collection<Publisher> getPublishers();
@ManagedStatistic
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java Wed Feb 26 23:27:39 2014
@@ -24,6 +24,4 @@ public interface Group<X extends Group<X
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
-
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java Wed Feb 26 23:27:39 2014
@@ -28,6 +28,5 @@ public interface GroupMember<X extends G
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java Wed Feb 26 23:27:39 2014
@@ -28,10 +28,8 @@ import java.util.Set;
public interface GroupProvider<X extends GroupProvider<X>> extends ConfiguredObject<X>
{
public static final String DESCRIPTION = "description";
- public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
- public static final String TIME_TO_LIVE = "timeToLive";
Set<Principal> getGroupPrincipalsForUser(String username);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java Wed Feb 26 23:27:39 2014
@@ -31,7 +31,6 @@ public interface KeyStore<X extends KeyS
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
String DESCRIPTION = "description";
String PATH = "path";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java Wed Feb 26 23:27:39 2014
@@ -29,8 +29,6 @@ public interface Plugin<X extends Plugin
//Hack, using it for the class name only for consistency with the other things.
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
- String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
// Attributes
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java Wed Feb 26 23:27:39 2014
@@ -27,8 +27,6 @@ public interface Port<X extends Port<X>>
{
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
- String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
String BINDING_ADDRESS = "bindingAddress";
String PORT = "port";
String PROTOCOLS = "protocols";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java Wed Feb 26 23:27:39 2014
@@ -28,8 +28,6 @@ public interface PreferencesProvider<X e
{
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
- String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
/**
* Returns preferences {@link Map} for a given user ID
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java Wed Feb 26 23:27:39 2014
@@ -21,6 +21,9 @@
package org.apache.qpid.server.model;
import java.util.Collection;
+
+import org.apache.qpid.server.message.MessageInstance;
+import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.queue.QueueEntryVisitor;
@ManagedObject
@@ -28,10 +31,8 @@ import org.apache.qpid.server.queue.Queu
public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>
{
- public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
- public static final String TIME_TO_LIVE = "timeToLive";
public static final String ALERT_REPEAT_GAP = "alertRepeatGap";
public static final String ALERT_THRESHOLD_MESSAGE_AGE = "alertThresholdMessageAge";
@@ -122,15 +123,15 @@ public interface Queue<X extends Queue<X
//children
- Collection<Binding> getBindings();
- Collection<Consumer> getConsumers();
+ Collection<? extends Binding> getBindings();
+ Collection<? extends Consumer> getConsumers();
//operations
void visit(QueueEntryVisitor visitor);
- void delete();
+ int delete();
void setNotificationListener(QueueNotificationListener listener);
@@ -147,13 +148,13 @@ public interface Queue<X extends Queue<X
long getMessagesOut();
@ManagedStatistic
- long getBindingCount();
+ int getBindingCount();
@ManagedStatistic
- long getConsumerCount();
+ int getConsumerCount();
@ManagedStatistic
- long getConsumerCountWithCredit();
+ int getConsumerCountWithCredit();
@ManagedStatistic
long getPersistentDequeuedBytes();
@@ -171,7 +172,7 @@ public interface Queue<X extends Queue<X
long getQueueDepthBytes();
@ManagedStatistic
- long getQueueDepthMessages();
+ int getQueueDepthMessages();
@ManagedStatistic
long getTotalDequeuedBytes();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java Wed Feb 26 23:27:39 2014
@@ -29,7 +29,6 @@ public interface Session<X extends Sessi
public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
- public static final String TIME_TO_LIVE = "timeToLive";
public static final String CHANNEL_ID = "channelId";
// PRODUCER_FLOW_BLOCKED is exposed as an interim step. We will expose attribute(s) that exposing
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java Wed Feb 26 23:27:39 2014
@@ -31,7 +31,6 @@ public interface TrustStore<X extends Tr
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
String DESCRIPTION = "description";
String PATH = "path";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java Wed Feb 26 23:27:39 2014
@@ -31,7 +31,6 @@ public interface User<X extends User<X>>
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
String PASSWORD = "password";
// Attributes
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java Wed Feb 26 23:27:39 2014
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.model;
+import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.MessageStore;
@@ -56,8 +57,6 @@ public interface VirtualHost<X extends V
String SUPPORTED_QUEUE_TYPES = "supportedQueueTypes";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
- String STATE = "state";
- String TIME_TO_LIVE = "timeToLive";
String CONFIG_PATH = "configPath";
// Attributes
@@ -156,7 +155,7 @@ public interface VirtualHost<X extends V
Collection<Exchange> getExchanges();
Exchange createExchange(String name, State initialState, boolean durable,
- LifetimePolicy lifetime, long ttl, String type, Map<String, Object> attributes)
+ LifetimePolicy lifetime, String type, Map<String, Object> attributes)
throws AccessControlException, IllegalArgumentException;
Queue createQueue(Map<String, Object> attributes)
@@ -187,6 +186,9 @@ public interface VirtualHost<X extends V
*/
SecurityManager getSecurityManager();
+ // TODO - remove this
+ TaskExecutor getTaskExecutor();
+
MessageStore getMessageStore();
String getType();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAlias.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAlias.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAlias.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAlias.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.model;
-import java.security.AccessControlException;
import java.util.Collection;
public interface VirtualHostAlias<X extends VirtualHostAlias<X>> extends ConfiguredObject<X>
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java Wed Feb 26 23:27:39 2014
@@ -101,18 +101,6 @@ public abstract class AbstractKeyStoreAd
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired) throws IllegalStateException, AccessControlException, IllegalArgumentException
- {
- throw new IllegalStateException();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
return Collections.emptySet();
@@ -147,10 +135,6 @@ public abstract class AbstractKeyStoreAd
{
return getLifetimePolicy();
}
- else if(KeyStore.TIME_TO_LIVE.equals(name))
- {
- return getTimeToLive();
- }
else if(KeyStore.PASSWORD.equals(name))
{
return getPassword();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java Wed Feb 26 23:27:39 2014
@@ -82,20 +82,6 @@ public abstract class AbstractPluginAdap
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired) throws IllegalStateException, AccessControlException,
- IllegalArgumentException
- {
- throw new UnsupportedOperationException();
- }
-
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
return Collections.emptyList();
@@ -126,10 +112,6 @@ public abstract class AbstractPluginAdap
{
return getLifetimePolicy();
}
- else if (TIME_TO_LIVE.equals(name))
- {
- return getTimeToLive();
- }
return super.getAttribute(name);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java Wed Feb 26 23:27:39 2014
@@ -132,19 +132,6 @@ public class AccessControlProviderAdapte
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired)
- throws IllegalStateException, AccessControlException, IllegalArgumentException
- {
- return 0;
- }
-
- @Override
public Collection<String> getAttributeNames()
{
return _supportedAttributes;
@@ -169,10 +156,6 @@ public class AccessControlProviderAdapte
{
return getState();
}
- else if(TIME_TO_LIVE.equals(name))
- {
- // TODO
- }
return super.getAttribute(name);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java Wed Feb 26 23:27:39 2014
@@ -144,19 +144,6 @@ public abstract class AuthenticationProv
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired)
- throws IllegalStateException, AccessControlException, IllegalArgumentException
- {
- return 0;
- }
-
- @Override
public Collection<String> getAttributeNames()
{
return _supportedAttributes;
@@ -181,10 +168,6 @@ public abstract class AuthenticationProv
{
return getState();
}
- else if(TIME_TO_LIVE.equals(name))
- {
- // TODO
- }
return super.getAttribute(name);
}
@@ -644,19 +627,6 @@ public abstract class AuthenticationProv
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired)
- throws IllegalStateException, AccessControlException, IllegalArgumentException
- {
- throw new IllegalStateException("ttl cannot be updated");
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
return null;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Wed Feb 26 23:27:39 2014
@@ -928,10 +928,6 @@ public class BrokerAdapter<X extends Bro
{
return LifetimePolicy.PERMANENT;
}
- else if(TIME_TO_LIVE.equals(name))
- {
- // TODO
- }
else if(BUILD_VERSION.equals(name))
{
return QpidProperties.getBuildVersion();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java Wed Feb 26 23:27:39 2014
@@ -145,19 +145,6 @@ public class FileSystemPreferencesProvid
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired) throws IllegalStateException, AccessControlException,
- IllegalArgumentException
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
return Collections.emptySet();
@@ -182,10 +169,6 @@ public class FileSystemPreferencesProvid
{
return getState();
}
- else if (TIME_TO_LIVE.equals(name))
- {
- // TODO
- }
return super.getAttribute(name);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java Wed Feb 26 23:27:39 2014
@@ -132,20 +132,6 @@ public class GroupProviderAdapter extend
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired)
- throws IllegalStateException, AccessControlException,
- IllegalArgumentException
- {
- return 0;
- }
-
- @Override
public Collection<String> getAttributeNames()
{
return _supportedAttributes;
@@ -170,10 +156,6 @@ public class GroupProviderAdapter extend
{
return getState();
}
- else if (TIME_TO_LIVE.equals(name))
- {
- // TODO
- }
return super.getAttribute(name);
}
@@ -407,20 +389,6 @@ public class GroupProviderAdapter extend
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired)
- throws IllegalStateException, AccessControlException,
- IllegalArgumentException
- {
- throw new IllegalStateException("ttl cannot be updated");
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(
Class<C> clazz)
{
@@ -590,20 +558,6 @@ public class GroupProviderAdapter extend
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired)
- throws IllegalStateException, AccessControlException,
- IllegalArgumentException
- {
- return 0;
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(
Class<C> clazz)
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java Wed Feb 26 23:27:39 2014
@@ -213,19 +213,6 @@ abstract public class PortAdapter<X exte
}
@Override
- public long getTimeToLive()
- {
- return 0;
- }
-
- @Override
- public long setTimeToLive(long expected, long desired)
- throws IllegalStateException, AccessControlException, IllegalArgumentException
- {
- throw new IllegalStateException();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
if(clazz == Connection.class)
@@ -263,10 +250,6 @@ abstract public class PortAdapter<X exte
{
return getLifetimePolicy();
}
- else if(TIME_TO_LIVE.equals(name))
- {
- return getTimeToLive();
- }
return super.getAttribute(name);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java Wed Feb 26 23:27:39 2014
@@ -32,6 +32,7 @@ import org.apache.qpid.server.model.*;
import org.apache.qpid.server.consumer.Consumer;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.protocol.AMQSessionModel;
+import org.apache.qpid.server.queue.QueueConsumer;
final class SessionAdapter extends AbstractConfiguredObject<SessionAdapter> implements Session<SessionAdapter>
{
@@ -39,7 +40,7 @@ final class SessionAdapter extends Abstr
private AMQSessionModel _session;
- private Map<Consumer, ConsumerAdapter> _consumerAdapters = new HashMap<Consumer, ConsumerAdapter>();
+ private Map<Consumer, QueueConsumer> _consumerAdapters = new HashMap<Consumer, QueueConsumer>();
public SessionAdapter(final AMQSessionModel session, TaskExecutor taskExecutor)
{
@@ -110,47 +111,6 @@ final class SessionAdapter extends Abstr
return null; //TODO
}
- public long getTimeToLive()
- {
- return 0; //TODO
- }
-
- public long setTimeToLive(final long expected, final long desired)
- throws IllegalStateException, AccessControlException, IllegalArgumentException
- {
- return 0; //TODO
- }
-
- /**
- * Register a ConsumerAdapter with this Session keyed by the Consumer.
- * @param consumer the org.apache.qpid.server.consumer.Consumer used to key the ConsumerAdapter.
- * @param adapter the registered ConsumerAdapter.
- */
- void consumerRegistered(Consumer consumer, ConsumerAdapter adapter)
- {
- synchronized (_consumerAdapters)
- {
- _consumerAdapters.put(consumer, adapter);
- }
- childAdded(adapter);
- }
-
- /**
- * Unregister a ConsumerAdapter with this Session keyed by the Consumer.
- * @param consumer the org.apache.qpid.server.consumer.Consumer used to key the ConsumerAdapter.
- */
- void consumerUnregistered(Consumer consumer)
- {
- ConsumerAdapter adapter = null;
- synchronized (_consumerAdapters)
- {
- adapter = _consumerAdapters.remove(consumer);
- }
- if (adapter != null)
- {
- childRemoved(adapter);
- }
- }
@Override
public Collection<String> getAttributeNames()
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java Wed Feb 26 23:27:39 2014
@@ -24,14 +24,11 @@ import java.io.File;
import java.lang.reflect.Type;
import java.security.AccessControlException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.UUID;
import org.apache.commons.configuration.CompositeConfiguration;
@@ -43,6 +40,8 @@ import org.apache.qpid.server.exchange.A
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.configuration.XmlConfigurationUtilities.MyConfiguration;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.*;
@@ -50,6 +49,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.AbstractQueue;
import org.apache.qpid.server.queue.ConflationQueue;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.access.Operation;
@@ -86,11 +86,6 @@ public final class VirtualHostAdapter ex
private final Map<AMQConnectionModel, ConnectionAdapter> _connectionAdapters =
new HashMap<AMQConnectionModel, ConnectionAdapter>();
- private final Map<AMQQueue, QueueAdapter> _queueAdapters =
- new HashMap<AMQQueue, QueueAdapter>();
-
- private final Map<org.apache.qpid.server.exchange.Exchange, ExchangeAdapter> _exchangeAdapters =
- new HashMap<org.apache.qpid.server.exchange.Exchange, ExchangeAdapter>();
private final Broker<?> _broker;
private final List<VirtualHostAlias> _aliases = new ArrayList<VirtualHostAlias>();
private StatisticsGatherer _brokerStatisticsGatherer;
@@ -162,46 +157,6 @@ public final class VirtualHostAdapter ex
}
- private void populateExchanges()
- {
- Collection<org.apache.qpid.server.exchange.Exchange> actualExchanges =
- _virtualHost.getExchanges();
-
- synchronized (_exchangeAdapters)
- {
- for(org.apache.qpid.server.exchange.Exchange exchange : actualExchanges)
- {
- if(!_exchangeAdapters.containsKey(exchange))
- {
- final ExchangeAdapter adapter = new ExchangeAdapter(this, exchange);
- _exchangeAdapters.put(exchange, adapter);
- childAdded(adapter);
-
- }
- }
- }
- }
-
-
- private void populateQueues()
- {
- Collection<AMQQueue> actualQueues = _virtualHost.getQueues();
- if ( actualQueues != null )
- {
- synchronized(_queueAdapters)
- {
- for(AMQQueue queue : actualQueues)
- {
- if(!_queueAdapters.containsKey(queue))
- {
- final QueueAdapter adapter = new QueueAdapter(this, queue);
- _queueAdapters.put(queue, adapter);
- childAdded(adapter);
- }
- }
- }
- }
- }
public Collection<VirtualHostAlias> getAliases()
{
@@ -232,18 +187,12 @@ public final class VirtualHostAdapter ex
public Collection<Queue> getQueues()
{
- synchronized(_queueAdapters)
- {
- return new ArrayList<Queue>(_queueAdapters.values());
- }
+ return _virtualHost == null ? Collections.<Queue>emptyList() : new ArrayList<Queue>(_virtualHost.getQueues());
}
public Collection<Exchange> getExchanges()
{
- synchronized (_exchangeAdapters)
- {
- return new ArrayList<Exchange>(_exchangeAdapters.values());
- }
+ return _virtualHost == null ? Collections.<Exchange>emptyList() : new ArrayList<Exchange>(_virtualHost.getExchangesExceptDefault());
}
@@ -257,23 +206,20 @@ public final class VirtualHostAdapter ex
boolean durable = MapValueConverter.getBooleanAttribute(Exchange.DURABLE, attributes, false);
LifetimePolicy lifetime = MapValueConverter.getEnumAttribute(LifetimePolicy.class, Exchange.LIFETIME_POLICY, attributes, LifetimePolicy.PERMANENT);
String type = MapValueConverter.getStringAttribute(Exchange.TYPE, attributes, null);
- long ttl = MapValueConverter.getLongAttribute(Exchange.TIME_TO_LIVE, attributes, 0l);
attributes.remove(Exchange.NAME);
attributes.remove(Exchange.STATE);
attributes.remove(Exchange.DURABLE);
attributes.remove(Exchange.LIFETIME_POLICY);
attributes.remove(Exchange.TYPE);
- attributes.remove(Exchange.TIME_TO_LIVE);
- return createExchange(name, state, durable, lifetime, ttl, type, attributes);
+ return createExchange(name, state, durable, lifetime, type, attributes);
}
public Exchange createExchange(final String name,
final State initialState,
final boolean durable,
final LifetimePolicy lifetime,
- final long ttl,
final String type,
final Map<String, Object> attributes)
throws AccessControlException, IllegalArgumentException
@@ -344,11 +290,8 @@ public final class VirtualHostAdapter ex
lifetime != null && lifetime != LifetimePolicy.PERMANENT
? LifetimePolicy.DELETE_ON_NO_LINKS : LifetimePolicy.PERMANENT);
attributes1.put(Exchange.ALTERNATE_EXCHANGE, alternateExchange);
- org.apache.qpid.server.exchange.Exchange exchange = _virtualHost.createExchange(attributes1);
- synchronized (_exchangeAdapters)
- {
- return _exchangeAdapters.get(exchange);
- }
+ NonDefaultExchange exchange = _virtualHost.createExchange(attributes1);
+ return exchange;
}
catch(ExchangeExistsException e)
@@ -405,12 +348,11 @@ public final class VirtualHostAdapter ex
try
{
- AMQQueue queue = _virtualHost.createQueue(attributes);
+ AMQQueue<?> queue = _virtualHost.createQueue(attributes);
+
+
+ return queue;
- synchronized (_queueAdapters)
- {
- return _queueAdapters.get(queue);
- }
}
catch(QueueExistsException qe)
@@ -565,76 +507,25 @@ public final class VirtualHostAdapter ex
throw new IllegalArgumentException("Cannot create a child of class " + childClass.getSimpleName());
}
- public void exchangeRegistered(org.apache.qpid.server.exchange.Exchange exchange)
+ public void exchangeRegistered(ExchangeImpl exchange)
{
- ExchangeAdapter adapter = null;
- synchronized (_exchangeAdapters)
- {
- if(!_exchangeAdapters.containsKey(exchange))
- {
- adapter = new ExchangeAdapter(this, exchange);
- _exchangeAdapters.put(exchange, adapter);
-
- }
-
- }
- if(adapter != null)
- {
- childAdded(adapter);
- }
-
+ childAdded((NonDefaultExchange)exchange);
}
- public void exchangeUnregistered(org.apache.qpid.server.exchange.Exchange exchange)
+ public void exchangeUnregistered(ExchangeImpl exchange)
{
- ExchangeAdapter adapter;
- synchronized (_exchangeAdapters)
- {
- adapter = _exchangeAdapters.remove(exchange);
-
- }
-
- if(adapter != null)
- {
- childRemoved(adapter);
- }
+ childRemoved((NonDefaultExchange)exchange);
}
public void queueRegistered(AMQQueue queue)
{
- QueueAdapter adapter = null;
- synchronized (_queueAdapters)
- {
- if(!_queueAdapters.containsKey(queue))
- {
- adapter = new QueueAdapter(this, queue);
- _queueAdapters.put(queue, adapter);
-
- }
-
- }
- if(adapter != null)
- {
- childAdded(adapter);
- }
-
+ childAdded(queue);
}
public void queueUnregistered(AMQQueue queue)
{
-
- QueueAdapter adapter;
- synchronized (_queueAdapters)
- {
- adapter = _queueAdapters.remove(queue);
-
- }
-
- if(adapter != null)
- {
- childRemoved(adapter);
- }
+ childRemoved(queue);
}
public void connectionRegistered(AMQConnectionModel connection)
@@ -676,22 +567,14 @@ public final class VirtualHostAdapter ex
}
}
- QueueAdapter getQueueAdapter(AMQQueue queue)
- {
- synchronized (_queueAdapters)
- {
- return _queueAdapters.get(queue);
- }
- }
-
public Collection<String> getExchangeTypes()
{
- Collection<ExchangeType<? extends org.apache.qpid.server.exchange.Exchange>> types =
+ Collection<ExchangeType<? extends ExchangeImpl>> types =
_virtualHost.getExchangeTypes();
Collection<String> exchangeTypes = new ArrayList<String>();
- for(ExchangeType<? extends org.apache.qpid.server.exchange.Exchange> type : types)
+ for(ExchangeType<? extends ExchangeImpl> type : types)
{
exchangeTypes.add(type.getType());
}
@@ -726,7 +609,7 @@ public final class VirtualHostAdapter ex
public void copy(MessageInstance entry, Queue queue)
{
final ServerMessage message = entry.getMessage();
- final AMQQueue toQueue = ((QueueAdapter)queue).getAMQQueue();
+ final AMQQueue toQueue = (AMQQueue)queue;
txn.enqueue(toQueue, message, new ServerTransaction.Action()
{
@@ -745,7 +628,7 @@ public final class VirtualHostAdapter ex
public void move(final MessageInstance entry, Queue queue)
{
final ServerMessage message = entry.getMessage();
- final AMQQueue toQueue = ((QueueAdapter)queue).getAMQQueue();
+ final AMQQueue toQueue = (AMQQueue)queue;
if(entry.acquire())
{
txn.enqueue(toQueue, message,
@@ -807,10 +690,6 @@ public final class VirtualHostAdapter ex
{
return LifetimePolicy.PERMANENT;
}
- else if(TIME_TO_LIVE.equals(name))
- {
- // TODO
- }
else if (_virtualHost != null)
{
return getAttributeFromVirtualHostImplementation(name);
@@ -1194,8 +1073,6 @@ public final class VirtualHostAdapter ex
virtualHostRegistry.registerVirtualHost(_virtualHost);
_virtualHost.addVirtualHostListener(this);
- populateQueues();
- populateExchanges();
synchronized(_aliases)
{
@@ -1303,4 +1180,9 @@ public final class VirtualHostAdapter ex
throw new AccessControlException("Setting of virtual host attributes is denied");
}
}
+
+ public TaskExecutor getTaskExecutor()
+ {
+ return super.getTaskExecutor();
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java Wed Feb 26 23:27:39 2014
@@ -110,19 +110,6 @@ public class VirtualHostAliasAdapter ext
}
@Override
- public long getTimeToLive()
- {
- return 0; // TODO - Implement
- }
-
- @Override
- public long setTimeToLive(long expected, long desired)
- throws IllegalStateException, AccessControlException, IllegalArgumentException
- {
- throw new IllegalStateException(); // TODO - Implement
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
{
return Collections.emptySet();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ExchangeType.java Wed Feb 26 23:27:39 2014
@@ -21,13 +21,13 @@
package org.apache.qpid.server.plugin;
import java.util.Map;
-import java.util.UUID;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.virtualhost.UnknownExchangeException;
import org.apache.qpid.server.virtualhost.VirtualHost;
-public interface ExchangeType<T extends Exchange> extends Pluggable
+public interface ExchangeType<T extends NonDefaultExchange> extends Pluggable
{
public String getType();
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=1572343&r1=1572342&r2=1572343&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 Wed Feb 26 23:27:39 2014
@@ -20,52 +20,51 @@
*/
package org.apache.qpid.server.queue;
-import org.apache.qpid.server.binding.Binding;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.binding.BindingImpl;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.exchange.ExchangeReferrer;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.QueueNotificationListener;
import org.apache.qpid.server.protocol.CapacityChecker;
import org.apache.qpid.server.consumer.Consumer;
import org.apache.qpid.server.util.Deletable;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import javax.management.NotificationListener;
import java.util.Collection;
import java.util.List;
import java.util.Set;
-public interface AMQQueue<E extends QueueEntry<E,Q,C>, Q extends AMQQueue<E,Q,C>, C extends Consumer>
- extends Comparable<Q>, ExchangeReferrer, BaseQueue<C>, MessageSource<C,Q>, CapacityChecker, MessageDestination,
- Deletable<Q>
+public interface AMQQueue<X extends AMQQueue<X>>
+ extends Comparable<AMQQueue>, ExchangeReferrer, BaseQueue, MessageSource, CapacityChecker, MessageDestination,
+ Deletable<AMQQueue>, Queue<X>
{
void setExclusivityPolicy(ExclusivityPolicy desiredPolicy) throws ExistingConsumerPreventsExclusive;
- public interface NotificationListener
- {
- void notifyClients(NotificationCheck notification, AMQQueue queue, String notificationMsg);
- }
-
boolean isExclusive();
- void addBinding(Binding binding);
+ void addBinding(BindingImpl binding);
- void removeBinding(Binding binding);
+ void removeBinding(BindingImpl binding);
- List<Binding> getBindings();
+ Collection<BindingImpl> getBindings();
int getBindingCount();
LogSubject getLogSubject();
- long getUnackedMessageBytes();
+ long getUnacknowledgedBytes();
- long getTotalDequeueCount();
+ long getTotalDequeuedMessages();
- long getTotalEnqueueCount();
+ long getTotalEnqueuedMessages();
LifetimePolicy getLifetimePolicy();
@@ -73,10 +72,11 @@ public interface AMQQueue<E extends Queu
VirtualHost getVirtualHost();
+ public Collection<QueueConsumer<?>> getConsumers();
int getConsumerCount();
- int getActiveConsumerCount();
+ int getConsumerCountWithCredit();
boolean hasExclusiveConsumer();
@@ -84,10 +84,10 @@ public interface AMQQueue<E extends Queu
boolean isEmpty();
- int getMessageCount();
+ int getQueueDepthMessages();
- long getQueueDepth();
+ long getQueueDepthBytes();
long getOldestMessageArrivalTime();
@@ -95,21 +95,21 @@ public interface AMQQueue<E extends Queu
int delete();
- void requeue(E entry);
+ void requeue(QueueEntry entry);
- void dequeue(E entry);
+ void dequeue(QueueEntry entry);
- void decrementUnackedMsgCount(E queueEntry);
+ void decrementUnackedMsgCount(QueueEntry queueEntry);
- boolean resend(final E entry, final C consumer);
+ boolean resend(final QueueEntry entry, final QueueConsumer<?> consumer);
- List<E> getMessagesOnTheQueue();
+ List<? extends QueueEntry> getMessagesOnTheQueue();
List<Long> getMessagesOnTheQueue(int num);
List<Long> getMessagesOnTheQueue(int num, int offset);
- E getMessageOnTheQueue(long messageId);
+ QueueEntry getMessageOnTheQueue(long messageId);
/**
* Returns a list of QueEntries from a given range of queue positions, eg messages 5 to 10 on the queue.
@@ -120,42 +120,42 @@ public interface AMQQueue<E extends Queu
* @param toPosition
* @return
*/
- public List<E> getMessagesRangeOnTheQueue(final long fromPosition, final long toPosition);
+ public List<? extends QueueEntry> getMessagesRangeOnTheQueue(final long fromPosition, final long toPosition);
- void visit(QueueEntryVisitor<E> visitor);
+ void visit(QueueEntryVisitor visitor);
- long getMaximumMessageSize();
+ long getAlertThresholdMessageSize();
void setMaximumMessageSize(long value);
- long getMaximumMessageCount();
+ long getAlertThresholdQueueDepthMessages();
void setMaximumMessageCount(long value);
- long getMaximumQueueDepth();
+ long getAlertThresholdQueueDepthBytes();
void setMaximumQueueDepth(long value);
- long getMaximumMessageAge();
+ long getAlertThresholdMessageAge();
void setMaximumMessageAge(final long maximumMessageAge);
- long getMinimumAlertRepeatGap();
+ long getAlertRepeatGap();
void setMinimumAlertRepeatGap(long value);
- long getCapacity();
+ long getQueueFlowControlSizeBytes();
void setCapacity(long capacity);
- long getFlowResumeCapacity();
+ long getQueueFlowResumeSizeBytes();
void setFlowResumeCapacity(long flowResumeCapacity);
@@ -174,9 +174,9 @@ public interface AMQQueue<E extends Queu
void stop();
- Exchange getAlternateExchange();
+ NonDefaultExchange getAlternateExchange();
- void setAlternateExchange(Exchange exchange);
+ void setAlternateExchange(NonDefaultExchange exchange);
Collection<String> getAvailableAttributes();
Object getAttribute(String attrName);
@@ -189,7 +189,7 @@ public interface AMQQueue<E extends Queu
*
* @return maximum delivery count
*/
- int getMaximumDeliveryCount();
+ int getMaximumDeliveryAttempts();
/**
* Sets the maximum delivery count.
@@ -198,7 +198,7 @@ public interface AMQQueue<E extends Queu
*/
public void setMaximumDeliveryCount(final int maximumDeliveryCount);
- void setNotificationListener(NotificationListener listener);
+ void setNotificationListener(QueueNotificationListener listener);
/**
* Sets the free text description of this queue.
@@ -213,18 +213,18 @@ public interface AMQQueue<E extends Queu
*/
String getDescription();
- long getPersistentByteDequeues();
+ long getPersistentDequeuedBytes();
- long getPersistentMsgDequeues();
+ long getPersistentDequeuedMessages();
- long getPersistentByteEnqueues();
+ long getPersistentEnqueuedBytes();
- long getPersistentMsgEnqueues();
+ long getPersistentEnqueuedMessages();
- long getTotalDequeueSize();
+ long getTotalDequeuedBytes();
- long getTotalEnqueueSize();
+ long getTotalEnqueuedBytes();
- long getUnackedMessageCount();
+ long getUnacknowledgedMessages();
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java Wed Feb 26 23:27:39 2014
@@ -25,20 +25,20 @@ import java.util.Map;
import java.util.UUID;
import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.QueueConfiguration;
import org.apache.qpid.server.exchange.DefaultExchangeFactory;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.MapValueConverter;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
import org.apache.qpid.server.virtualhost.ExchangeExistsException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
import org.apache.qpid.server.virtualhost.UnknownExchangeException;
@@ -154,14 +154,14 @@ public class AMQQueueFactory implements
{
final String altExchangeAttr = (String) attributes.get(Queue.ALTERNATE_EXCHANGE);
- Exchange altExchange;
+ NonDefaultExchange altExchange;
try
{
- altExchange = _virtualHost.getExchange(UUID.fromString(altExchangeAttr));
+ altExchange = (NonDefaultExchange) _virtualHost.getExchange(UUID.fromString(altExchangeAttr));
}
catch(IllegalArgumentException e)
{
- altExchange = _virtualHost.getExchange(altExchangeAttr);
+ altExchange = (NonDefaultExchange) _virtualHost.getExchange(altExchangeAttr);
}
queue.setAlternateExchange(altExchange);
}
@@ -183,7 +183,7 @@ public class AMQQueueFactory implements
final String dlExchangeName = getDeadLetterExchangeName(queueName);
final String dlQueueName = getDeadLetterQueueName(queueName);
- Exchange dlExchange = null;
+ NonDefaultExchange dlExchange = null;
final UUID dlExchangeId = UUIDGenerator.generateExchangeUUID(dlExchangeName, _virtualHost.getName());
try
@@ -202,7 +202,7 @@ public class AMQQueueFactory implements
catch(ExchangeExistsException e)
{
// We're ok if the exchange already exists
- dlExchange = e.getExistingExchange();
+ dlExchange = (NonDefaultExchange) e.getExistingExchange();
}
catch (ReservedExchangeNameException e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org