From ba1949c68adb1291cc8065cae65091167ac589b6 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Sun, 24 Nov 2013 20:20:31 +0000 Subject: QPID-5372: Stop generation of an excessive amount of debug logging for PreferencesProviderFactory when a Broker tab is opened in web management console git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1545067 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/model/adapter/BrokerAdapter.java | 2 +- .../qpid/server/plugin/PluggableFactoryLoader.java | 63 ++++++++++++++++++++++ .../server/plugin/PreferencesProviderFactory.java | 46 +--------------- 3 files changed, 66 insertions(+), 45 deletions(-) create mode 100644 qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluggableFactoryLoader.java (limited to 'qpid/java') 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 2fa185ce98..e7b5d65c65 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 @@ -785,7 +785,7 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat } else if (SUPPORTED_PREFERENCES_PROVIDERS_TYPES.equals(name)) { - return PreferencesProviderFactory.TYPES.get(); + return PreferencesProviderFactory.FACTORIES.getDescriptiveTypes(); } else if (MODEL_VERSION.equals(name)) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluggableFactoryLoader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluggableFactoryLoader.java new file mode 100644 index 0000000000..7a8b7c0c65 --- /dev/null +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PluggableFactoryLoader.java @@ -0,0 +1,63 @@ +/* + * 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.plugin; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +public class PluggableFactoryLoader +{ + private final Map _factoriesMap; + private final Set _types; + + public PluggableFactoryLoader(Class factoryClass) + { + Map fm = new HashMap(); + QpidServiceLoader qpidServiceLoader = new QpidServiceLoader(); + Iterable factories = qpidServiceLoader.atLeastOneInstanceOf(factoryClass); + for (T factory : factories) + { + String descriptiveType = factory.getType(); + if (fm.containsKey(descriptiveType)) + { + throw new IllegalStateException(factoryClass.getSimpleName() + " with type name '" + descriptiveType + + "' is already registered using class '" + fm.get(descriptiveType).getClass().getName() + + "', can not register class '" + factory.getClass().getName() + "'"); + } + fm.put(descriptiveType, factory); + } + _factoriesMap = Collections.unmodifiableMap(fm); + _types = Collections.unmodifiableSortedSet(new TreeSet(_factoriesMap.keySet())); + } + + public T get(String type) + { + return _factoriesMap.get(type); + } + + public Collection getDescriptiveTypes() + { + return _types; + } +} diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java index 24f3a0bc85..92135ab14a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java @@ -18,10 +18,6 @@ */ package org.apache.qpid.server.plugin; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; import java.util.Map; import java.util.UUID; @@ -30,46 +26,8 @@ import org.apache.qpid.server.model.PreferencesProvider; public interface PreferencesProviderFactory extends Pluggable { - PreferencesProvider createInstance(UUID id, Map attributes, AuthenticationProvider authenticationProvider); - - static final class TYPES - { - private TYPES() - { - } - - public static Collection get() - { - QpidServiceLoader qpidServiceLoader = new QpidServiceLoader(); - Iterable factories = qpidServiceLoader.atLeastOneInstanceOf(PreferencesProviderFactory.class); - List names = new ArrayList(); - for(PreferencesProviderFactory factory : factories) - { - names.add(factory.getType()); - } - return Collections.unmodifiableCollection(names); - } - } + PluggableFactoryLoader FACTORIES = new PluggableFactoryLoader(PreferencesProviderFactory.class); + PreferencesProvider createInstance(UUID id, Map attributes, AuthenticationProvider authenticationProvider); - static final class FACTORIES - { - private FACTORIES() - { - } - - public static PreferencesProviderFactory get(String type) - { - QpidServiceLoader qpidServiceLoader = new QpidServiceLoader(); - Iterable factories = qpidServiceLoader.atLeastOneInstanceOf(PreferencesProviderFactory.class); - for(PreferencesProviderFactory factory : factories) - { - if(factory.getType().equals(type)) - { - return factory; - } - } - return null; - } - } } -- cgit v1.2.1