From 1c420bf20a6902efb0256c881c8b777ccd211b4a Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Mon, 29 Dec 2014 17:06:39 +0000 Subject: QPID-6291: [Java Broker] Remove the now defunct supported attributes: VH#supportedExchangeTypes, VH#supportedQueueTypes, Broker#supportedAuthenticationProviders, Broker#supportedPreferencesProviderTypes Clients now can discover the supported attributes in a generic fashion via the metadata service. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1648392 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/model/Broker.java | 9 --------- .../main/java/org/apache/qpid/server/model/BrokerModel.java | 4 +++- .../main/java/org/apache/qpid/server/model/VirtualHost.java | 10 ---------- .../org/apache/qpid/server/model/adapter/BrokerAdapter.java | 12 ------------ .../apache/qpid/server/virtualhost/AbstractVirtualHost.java | 12 ------------ 5 files changed, 3 insertions(+), 44 deletions(-) (limited to 'qpid/java/broker-core') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java index 0859be7381..6435124bd8 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java @@ -40,8 +40,6 @@ public interface Broker> extends ConfiguredObject, EventL String PLATFORM = "platform"; String PROCESS_PID = "processPid"; String PRODUCT_VERSION = "productVersion"; - String SUPPORTED_AUTHENTICATION_PROVIDERS = "supportedAuthenticationProviders"; - String SUPPORTED_PREFERENCES_PROVIDER_TYPES = "supportedPreferencesProviderTypes"; String DEFAULT_VIRTUAL_HOST = "defaultVirtualHost"; String STATISTICS_REPORTING_PERIOD = "statisticsReportingPeriod"; String STATISTICS_REPORTING_RESET_ENABLED = "statisticsReportingResetEnabled"; @@ -108,13 +106,6 @@ public interface Broker> extends ConfiguredObject, EventL @DerivedAttribute String getProductVersion(); - - @DerivedAttribute - Collection getSupportedAuthenticationProviders(); - - @DerivedAttribute - Collection getSupportedPreferencesProviderTypes(); - @ManagedAttribute String getDefaultVirtualHost(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java index 8d7033677f..0e700b1e71 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java @@ -42,7 +42,9 @@ public final class BrokerModel extends Model * 1.3 Truststore/Keystore type => trustStoreType / type => keyStoreType * 1.4 Separate messageStoreSettings from virtualhost * 2.0 Introduce VirtualHostNode as a child of a Broker instead of VirtualHost - * 2.1 Add VH aliases; remove Broker#supportedVirtualHostNodeTypes and #supportedVirtualHostTypes + * 2.1 Add VH aliases; + * Remove Broker#supportedVirtualHostNodeTypes, #supportedVirtualHostTypes, #supportedAuthenticationProviders, + * supportedPreferencesProviderTypes, VH#supportedExchangeTypes, VH#supportedQueueTypes */ public static final int MODEL_MAJOR_VERSION = 2; public static final int MODEL_MINOR_VERSION = 1; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java index c0e907b494..79f37b66cb 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java @@ -40,19 +40,9 @@ public interface VirtualHost, Q extends Queue, String STORE_TRANSACTION_IDLE_TIMEOUT_WARN = "storeTransactionIdleTimeoutWarn"; String STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE = "storeTransactionOpenTimeoutClose"; String STORE_TRANSACTION_OPEN_TIMEOUT_WARN = "storeTransactionOpenTimeoutWarn"; - String SUPPORTED_EXCHANGE_TYPES = "supportedExchangeTypes"; - String SUPPORTED_QUEUE_TYPES = "supportedQueueTypes"; String HOUSE_KEEPING_THREAD_COUNT = "houseKeepingThreadCount"; String MODEL_VERSION = "modelVersion"; - // TODO - this isn't really an attribute - @DerivedAttribute - Collection getSupportedExchangeTypes(); - - // TODO - this isn't really an attribute - @DerivedAttribute - Collection getSupportedQueueTypes(); - @ManagedContextDefault( name = "queue.deadLetterQueueEnabled") public static final boolean DEFAULT_DEAD_LETTER_QUEUE_ENABLED = false; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java index fcaf5a690c..ac14308d2d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java @@ -326,18 +326,6 @@ public class BrokerAdapter extends AbstractConfiguredObject imple return QpidProperties.getReleaseVersion(); } - @Override - public Collection getSupportedAuthenticationProviders() - { - return getObjectFactory().getSupportedTypes(AuthenticationProvider.class); - } - - @Override - public Collection getSupportedPreferencesProviderTypes() - { - return getObjectFactory().getSupportedTypes(PreferencesProvider.class); - } - @Override public String getDefaultVirtualHost() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java index 4dc975ad80..4086a67aae 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java @@ -1086,18 +1086,6 @@ public abstract class AbstractVirtualHost> exte txn.commit(); } - @Override - public Collection getSupportedExchangeTypes() - { - return getObjectFactory().getSupportedTypes(Exchange.class); - } - - @Override - public Collection getSupportedQueueTypes() - { - return getObjectFactory().getSupportedTypes(Queue.class); - } - @Override public boolean isQueue_deadLetterQueueEnabled() { -- cgit v1.2.1