1 files changed, 3 insertions, 17 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java
index 6e92121036..35651b442c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/AuthenticationManagerFactory.java
@@ -21,10 +21,11 @@ package org.apache.qpid.server.plugin;
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.security.auth.manager.AbstractAuthenticationManager;
 
-public interface AuthenticationManagerFactory extends Pluggable
+public interface AuthenticationManagerFactory<X extends AuthenticationProvider<X>> extends ConfiguredObjectTypeFactory<X>
 {
 
     /**
@@ -34,22 +35,7 @@ public interface AuthenticationManagerFactory extends Pluggable
     String getType();
 
     /**
-     * Creates authentication manager from the provided attributes
-     *
-     * @param broker
-     *            broker model object
-     * @param attributes
-     *            attributes to create authentication manager
-     *
-     * @param recovering
-     * @return authentication manager instance
-     */
-    AbstractAuthenticationManager createInstance(Broker broker,
-                                                 Map<String, Object> attributes,
-                                                 final boolean recovering);
-
-    /**
-     * Get the names of attributes the authentication manager which can be passed into {@link #createInstance(org.apache.qpid.server.model.Broker, java.util.Map, boolean)} to create the
+     * Get the names of attributes the authentication manager
      * authentication manager
      *
      * @return the collection of attribute names