From 58a7f5e8759446fd6c2cc5876581bc414d78d9bd Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 11 Apr 2014 15:30:38 +0000 Subject: QPID-5680 : [Java Broker] move configuration defualts to annotations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586683 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/exchange/DirectExchange.java | 15 ++- .../qpid/server/exchange/FanoutExchange.java | 6 +- .../qpid/server/exchange/HeadersExchange.java | 16 +-- .../apache/qpid/server/exchange/TopicExchange.java | 2 + .../server/model/AbstractConfiguredObject.java | 45 ++++--- .../java/org/apache/qpid/server/model/Broker.java | 3 + .../apache/qpid/server/model/ConfiguredObject.java | 2 +- .../org/apache/qpid/server/model/KeyStore.java | 23 ---- .../java/org/apache/qpid/server/model/Plugin.java | 8 -- .../apache/qpid/server/model/RuntimeDefault.java | 33 +++++ .../apache/qpid/server/model/SystemContext.java | 3 +- .../org/apache/qpid/server/model/TrustStore.java | 19 --- .../org/apache/qpid/server/model/VirtualHost.java | 15 ++- .../qpid/server/model/adapter/BrokerAdapter.java | 10 +- .../server/model/adapter/ConnectionAdapter.java | 2 +- .../model/adapter/FileBasedGroupProvider.java | 4 +- .../adapter/FileSystemPreferencesProvider.java | 11 +- .../qpid/server/model/adapter/SessionAdapter.java | 2 +- .../model/adapter/VirtualHostAliasAdapter.java | 4 +- .../qpid/server/model/port/AbstractPort.java | 4 - .../qpid/server/plugin/SystemNodeCreator.java | 1 - .../qpid/server/queue/QueueConsumerImpl.java | 4 +- .../server/security/AbstractKeyStoreAdapter.java | 130 ------------------- .../apache/qpid/server/security/FileKeyStore.java | 139 ++++++++++++++++++--- .../qpid/server/security/FileTrustStore.java | 131 ++++++++++++++++--- .../PrincipalDatabaseAuthenticationManager.java | 2 +- .../server/virtualhost/AbstractVirtualHost.java | 105 ++++------------ .../qpid/server/virtualhost/VirtualHostImpl.java | 2 - .../src/main/resources/initial-config.json | 2 +- .../BrokerConfigurationStoreCreatorTest.java | 29 ++--- .../configuration/startup/BrokerRecovererTest.java | 12 +- .../startup/FileKeyStoreCreationTest.java | 25 ++-- .../startup/FileTrustStoreCreationTest.java | 20 +-- .../startup/VirtualHostCreationTest.java | 2 +- .../store/ConfigurationEntryStoreTestCase.java | 30 ++--- .../qpid/server/model/adapter/PortFactoryTest.java | 8 +- .../qpid/server/virtualhost/MockVirtualHost.java | 8 +- .../plugins/ACLFileAccessControlProvider.java | 9 -- .../qpid/server/protocol/v0_10/ServerSession.java | 41 ++++-- .../server/management/amqp/ManagementNode.java | 29 +++-- .../management/amqp/ManagementNodeCreator.java | 2 +- .../server/management/plugin/HttpManagement.java | 115 +++++++++-------- .../plugin/HttpManagementConfiguration.java | 12 +- .../plugin/HttpManagementFactoryTest.java | 10 +- .../management/plugin/HttpManagementTest.java | 2 +- .../org/apache/qpid/server/jmx/JMXManagement.java | 24 ++-- .../qpid/server/jmx/JMXManagementFactoryTest.java | 2 +- .../auth/manager/ExternalAuthenticationTest.java | 7 +- .../qpid/systest/rest/HttpManagementRestTest.java | 6 +- .../apache/qpid/systest/rest/KeyStoreRestTest.java | 31 ++--- .../qpid/systest/rest/TrustStoreRestTest.java | 29 ++--- .../qpid/systest/rest/acl/BrokerACLTest.java | 44 +++---- 52 files changed, 640 insertions(+), 600 deletions(-) create mode 100644 qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/RuntimeDefault.java delete mode 100644 qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStoreAdapter.java (limited to 'qpid/java') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java index ca5800547e..671cbbe7e7 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java @@ -20,11 +20,18 @@ */ package org.apache.qpid.server.exchange; +import java.util.ArrayList; +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.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArraySet; + import org.apache.log4j.Logger; + import org.apache.qpid.server.binding.BindingImpl; import org.apache.qpid.server.filter.AMQInvalidArgumentException; import org.apache.qpid.server.filter.FilterSupport; @@ -32,18 +39,14 @@ import org.apache.qpid.server.filter.Filterable; import org.apache.qpid.server.filter.MessageFilter; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.ServerMessage; +import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.plugin.ExchangeType; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.virtualhost.UnknownExchangeException; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArraySet; - +@ManagedObject( category = false, type = "direct" ) public class DirectExchange extends AbstractExchange { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java index 893ffee4c1..1484480c5d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java @@ -20,11 +20,13 @@ */ package org.apache.qpid.server.exchange; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; + import org.apache.log4j.Logger; import org.apache.qpid.server.binding.BindingImpl; @@ -34,14 +36,14 @@ import org.apache.qpid.server.filter.Filterable; import org.apache.qpid.server.filter.MessageFilter; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.ServerMessage; +import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.plugin.ExchangeType; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.virtualhost.UnknownExchangeException; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -import java.util.ArrayList; - +@ManagedObject( category = false, type = "fanout" ) public class FanoutExchange extends AbstractExchange { private static final Logger _logger = Logger.getLogger(FanoutExchange.class); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java index dd5fa5fb4b..6aa32c8528 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java @@ -20,25 +20,26 @@ */ package org.apache.qpid.server.exchange; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; + import org.apache.log4j.Logger; 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; +import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.plugin.ExchangeType; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.virtualhost.UnknownExchangeException; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.CopyOnWriteArraySet; - /** * An exchange that binds queues based on a set of required headers and header values * and routes messages to these queues by matching the headers of the message against @@ -66,6 +67,7 @@ import java.util.concurrent.CopyOnWriteArraySet; * amq.match - pub/sub on field content/value * */ +@ManagedObject( category = false, type = "headers" ) public class HeadersExchange extends AbstractExchange { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java index 409d77a460..992d9714cb 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java @@ -38,6 +38,7 @@ import org.apache.qpid.server.filter.FilterSupport; import org.apache.qpid.server.filter.Filterable; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.ServerMessage; +import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.plugin.ExchangeType; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.BaseQueue; @@ -45,6 +46,7 @@ import org.apache.qpid.server.util.ConnectionScopedRuntimeException; import org.apache.qpid.server.virtualhost.UnknownExchangeException; import org.apache.qpid.server.virtualhost.VirtualHostImpl; +@ManagedObject( category = false, type = "topic" ) public class TopicExchange extends AbstractExchange { public static final ExchangeType TYPE = new TopicExchangeType(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java index b4203bfed5..278e8a5304 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java @@ -80,10 +80,13 @@ public abstract class AbstractConfiguredObject> im private static final Map, Map> _allAutomatedFields = Collections.synchronizedMap(new HashMap, Map>()); private static final Map SECURE_VALUES; + + public static final String SECURED_STRING_VALUE = "********"; + static { Map secureValues = new HashMap(); - secureValues.put(String.class, "********"); + secureValues.put(String.class, SECURED_STRING_VALUE); secureValues.put(Integer.class, 0); secureValues.put(Long.class, 0l); secureValues.put(Byte.class, (byte)0); @@ -135,12 +138,14 @@ public abstract class AbstractConfiguredObject> im private final Map> _attributeTypes; private final Map _automatedFields; + @ManagedAttributeField + private String _type; + protected AbstractConfiguredObject(UUID id, - Map defaults, Map attributes, TaskExecutor taskExecutor) { - this(defaults, combineIdWithAttributes(id,attributes), taskExecutor); + this(combineIdWithAttributes(id,attributes), taskExecutor); } public static Map combineIdWithAttributes(UUID id, Map attributes) @@ -151,20 +156,11 @@ public abstract class AbstractConfiguredObject> im } - protected AbstractConfiguredObject(UUID id, Map defaults, Map attributes, - TaskExecutor taskExecutor, boolean filterAttributes) - - { - this(Collections., ConfiguredObject>emptyMap(), - defaults, combineIdWithAttributes(id, attributes), taskExecutor, filterAttributes); - } - - protected AbstractConfiguredObject(Map defaults, - Map attributes, + protected AbstractConfiguredObject(Map attributes, TaskExecutor taskExecutor) { this(Collections., ConfiguredObject>emptyMap(), - defaults, attributes, taskExecutor, true); + Collections.emptyMap(), attributes, taskExecutor, true); } protected AbstractConfiguredObject(final Map, ConfiguredObject> parents, @@ -198,6 +194,15 @@ public abstract class AbstractConfiguredObject> im _attributeTypes = getAttributeTypes(getClass()); _automatedFields = getAutomatedFields(getClass()); + _type = getType(getClass()); + if(attributes.get(TYPE) != null) + { + if(!_type.equals(attributes.get(TYPE))) + { + throw new IllegalConfigurationException("Provided type is " + attributes.get(TYPE) + + " but calculated type is " + _type); + } + } for (Class childClass : Model.getInstance().getChildTypes(getCategoryClass())) { @@ -277,11 +282,15 @@ public abstract class AbstractConfiguredObject> im } - private void automatedSetValue(final String name, final Object value) + private void automatedSetValue(final String name, Object value) { try { final Attribute attribute = _attributeTypes.get(name); + if(value == null && !"".equals(attribute.getAnnotation().defaultValue())) + { + value = attribute.getAnnotation().defaultValue(); + } _automatedFields.get(name).set(this, attribute.convert(value, this)); } catch (IllegalAccessException e) @@ -292,7 +301,7 @@ public abstract class AbstractConfiguredObject> im protected AbstractConfiguredObject(UUID id, TaskExecutor taskExecutor) { - this(id, Collections.emptyMap(), Collections.emptyMap(), taskExecutor); + this(id, Collections.emptyMap(), taskExecutor); } public void open() @@ -1037,9 +1046,9 @@ public abstract class AbstractConfiguredObject> im } @Override - public String getType() + public final String getType() { - return (String)getAttribute(TYPE); + return _type; } 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 9c7bb295b9..6bb2e1beb3 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 @@ -59,6 +59,9 @@ public interface Broker> extends ConfiguredObject, EventL String CONNECTION_HEART_BEAT_DELAY = "connection.heartBeatDelay"; String CONNECTION_CLOSE_WHEN_NO_ROUTE = "connection.closeWhenNoRoute"; + @ManagedContextDefault(name = "broker.name") + static final String DEFAULT_BROKER_NAME = "Broker"; + @ManagedAttribute( derived = true ) String getBuildVersion(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java index b4321a2625..9f0237e97a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java @@ -65,7 +65,7 @@ public interface ConfiguredObject> @ManagedAttribute String getDescription(); - @ManagedAttribute + @ManagedAttribute( automate = true ) String getType(); @ManagedAttribute(automate = true) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java index 47f5a65477..5d574055a4 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java @@ -31,29 +31,6 @@ public interface KeyStore> extends ConfiguredObject String STATE = "state"; String DESCRIPTION = "description"; - String PATH = "path"; - String PASSWORD = "password"; - String KEY_STORE_TYPE = "keyStoreType"; - String CERTIFICATE_ALIAS = "certificateAlias"; - String KEY_MANAGER_FACTORY_ALGORITHM = "keyManagerFactoryAlgorithm"; - - @ManagedAttribute( secure = true, automate = true, mandatory = true ) - public String getPassword(); - - @ManagedAttribute( automate = true, mandatory = true) - public String getPath(); - - @ManagedAttribute( automate = true ) - public String getCertificateAlias(); - - @ManagedAttribute( automate = true ) - public String getKeyManagerFactoryAlgorithm(); - - @ManagedAttribute( automate = true ) - public String getKeyStoreType(); - - public void setPassword(String password); - public KeyManager[] getKeyManagers() throws GeneralSecurityException; } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java index ff28014090..5c311908f6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java @@ -20,10 +20,6 @@ */ package org.apache.qpid.server.model; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - @ManagedObject public interface Plugin> extends ConfiguredObject { @@ -31,8 +27,4 @@ public interface Plugin> extends ConfiguredObject String DURABLE = "durable"; String LIFETIME_POLICY = "lifetimePolicy"; - // Attributes - - @ManagedAttribute - String getPluginType(); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/RuntimeDefault.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/RuntimeDefault.java new file mode 100644 index 0000000000..9014de69f2 --- /dev/null +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/RuntimeDefault.java @@ -0,0 +1,33 @@ +/* + * + * 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.model; + +public abstract class RuntimeDefault +{ + public abstract T value(); + + final public String toString() + { + T value = value(); + return value == null ? null : value.toString(); + } + +} diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContext.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContext.java index 367df3ea5c..8e3a2acd79 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContext.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContext.java @@ -24,7 +24,6 @@ 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.Iterator; import java.util.Map; @@ -64,7 +63,7 @@ public class SystemContext extends AbstractConfiguredObject final LogRecorder logRecorder, final BrokerOptions brokerOptions) { - super(SYSTEM_ID, Collections.emptyMap(), createAttributes(brokerOptions), taskExecutor); + super(SYSTEM_ID, createAttributes(brokerOptions), taskExecutor); _eventLogger = eventLogger; getTaskExecutor().start(); _objectFactory = configuredObjectFactory; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java index 92ea8e7863..d1b1a3d7a5 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java @@ -28,30 +28,11 @@ public interface TrustStore> extends ConfiguredObject { String DURABLE = "durable"; String LIFETIME_POLICY = "lifetimePolicy"; - String STATE = "state"; String DESCRIPTION = "description"; - String PATH = "path"; - String PASSWORD = "password"; - String TRUST_STORE_TYPE = "trustStoreType"; - String PEERS_ONLY = "peersOnly"; - String TRUST_MANAGER_FACTORY_ALGORITHM = "trustManagerFactoryAlgorithm"; - @ManagedAttribute( secure = true, automate = true, mandatory = true) public String getPassword(); - @ManagedAttribute( automate = true, mandatory = true ) - public String getPath(); - - @ManagedAttribute( automate = true ) - public String getTrustManagerFactoryAlgorithm(); - - @ManagedAttribute( automate = true ) - public String getTrustStoreType(); - - @ManagedAttribute( automate = true ) - public boolean isPeersOnly(); - public void setPassword(String password); 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 37ca65001c..33ccee8e71 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 @@ -96,8 +96,19 @@ public interface VirtualHost, Q extends Queue, @ManagedAttribute String getSecurityAcl(); - @ManagedAttribute - int getHouseKeepingThreadCount(); + @ManagedContextDefault( name = "virtualhost.housekeepingThreadCount") + public static final RuntimeDefault DEFAULT_HOUSEKEEPING_THREAD_COUNT = + new RuntimeDefault() + { + @Override + public Integer value() + { + return Runtime.getRuntime().availableProcessors(); + } + }; + + @ManagedAttribute( automate = true, defaultValue = "${virtualhost.housekeepingThreadCount}") + int getHousekeepingThreadCount(); @ManagedAttribute( automate = true ) Map getMessageStoreSettings(); 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 e8dba7ed3f..b36d31b6e8 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 @@ -87,13 +87,6 @@ public class BrokerAdapter extends AbstractConfiguredObject imple put(STORE_VERSION, String.class); }}); - public static final String DEFAULT_NAME = "QpidBroker"; - - @SuppressWarnings("serial") - private static final Map DEFAULTS = Collections.unmodifiableMap(new HashMap(){{ - put(Broker.NAME, DEFAULT_NAME); - - }}); public static final String MANAGEMENT_MODE_AUTHENTICATION = "MANAGEMENT_MODE_AUTHENTICATION"; private final ConfiguredObjectFactory _objectFactory; @@ -143,7 +136,8 @@ public class BrokerAdapter extends AbstractConfiguredObject imple Map attributes, SystemContext parent) { - super(Collections., ConfiguredObject>singletonMap(SystemContext.class, parent), DEFAULTS, combineIdWithAttributes(id,MapValueConverter.convert(attributes, ATTRIBUTE_TYPES)), parent.getTaskExecutor()); + super(Collections., ConfiguredObject>singletonMap(SystemContext.class, parent), + Collections.emptyMap(), combineIdWithAttributes(id,MapValueConverter.convert(attributes, ATTRIBUTE_TYPES)), parent.getTaskExecutor()); _objectFactory = parent.getObjectFactory(); _virtualHostRegistry = new VirtualHostRegistry(parent.getEventLogger()); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java index 595a262486..f432a540e5 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java @@ -60,7 +60,7 @@ public final class ConnectionAdapter extends AbstractConfiguredObjectemptyMap(), createAttributes(conn), taskExecutor); + super(createAttributes(conn), taskExecutor); _connection = conn; open(); conn.addSessionListener(this); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java index 22877a4ea9..525a02d3a6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java @@ -358,7 +358,7 @@ public class FileBasedGroupProvider public GroupAdapter(Map attributes, TaskExecutor taskExecutor) { - super(Collections.emptyMap(),attributes, taskExecutor); + super(attributes, taskExecutor); } @@ -508,7 +508,7 @@ public class FileBasedGroupProvider public GroupMemberAdapter(Map attrMap, TaskExecutor taskExecutor) { - super(Collections.emptyMap(), attrMap, taskExecutor); + super(attrMap, taskExecutor); } @Override diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java index ec2a0574fa..7281799fc2 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java @@ -68,18 +68,13 @@ public class FileSystemPreferencesProvider extends AbstractConfiguredObject DEFAULTS = Collections.unmodifiableMap(new HashMap() - {{ - put(TYPE, FileSystemPreferencesProvider.class.getSimpleName()); - }}); + @SuppressWarnings("serial") private static final Map ATTRIBUTE_TYPES = Collections.unmodifiableMap(new HashMap() {{ put(NAME, String.class); put(PATH, String.class); - put(TYPE, String.class); }}); private final AuthenticationProvider _authenticationProvider; @@ -91,7 +86,7 @@ public class FileSystemPreferencesProvider extends AbstractConfiguredObject authenticationProvider) { super(Collections., ConfiguredObject>singletonMap(AuthenticationProvider.class, authenticationProvider), - DEFAULTS, + Collections.emptyMap(), combineIdWithAttributes(id,MapValueConverter.convert(attributes, ATTRIBUTE_TYPES)), authenticationProvider.getParent(Broker.class).getTaskExecutor()); State state = MapValueConverter.getEnumAttribute(State.class, STATE, attributes, State.INITIALISING); @@ -341,7 +336,7 @@ public class FileSystemPreferencesProvider extends AbstractConfiguredObject impl public SessionAdapter(final AMQSessionModel session, TaskExecutor taskExecutor) { - super(Collections.emptyMap(),createAttributes(session), taskExecutor); + super(createAttributes(session), taskExecutor); _session = session; _session.addConsumerListener(new ConsumerListener() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java index 9faa5f9493..15843d14fe 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java @@ -44,8 +44,8 @@ public class VirtualHostAliasAdapter extends AbstractConfiguredObjectemptyMap(), - createAttributes(virtualHost, port), + super( + createAttributes(virtualHost, port), virtualHost.getTaskExecutor()); _vhost = virtualHost; _port = port; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java index 592968ab94..ef79f9f6bd 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java @@ -120,10 +120,6 @@ abstract public class AbstractPort> extends AbstractCo { updatedDefaults.put(Port.TRANSPORTS, Collections.singleton(DEFAULT_TRANSPORT)); } - if(!defaults.containsKey(NAME)) - { - updatedDefaults.put(NAME, attributes.get(PORT) + "-" + attributes.get(TYPE)); - } return updatedDefaults; } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemNodeCreator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemNodeCreator.java index eb3a21e77e..b7cb56718c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemNodeCreator.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemNodeCreator.java @@ -31,7 +31,6 @@ public interface SystemNodeCreator extends Pluggable void removeSystemNode(MessageNode node); VirtualHostImpl getVirtualHost(); - org.apache.qpid.server.model.VirtualHost getVirtualHostModel(); } void register(SystemNodeRegistry registry); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java index b42eb1e67f..8910a7ef60 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java @@ -121,8 +121,8 @@ class QueueConsumerImpl final Class messageClass, EnumSet