From ebf13e02e7371a262d96a96a40ff34bbe9f47816 Mon Sep 17 00:00:00 2001
From: Andrew MacBean <macbean@apache.org>
Date: Thu, 26 Jun 2014 13:59:36 +0000
Subject: QPID-5821: [Java Broker] Make JDBC username and password separate
 attributes within the model

Work done by Keith Wall <kwall@apache.org> and me.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1605787 13f79535-47bb-0310-9956-ffa450edef68
---
 .../plugin/JDBCConnectionProviderFactory.java      | 23 +++-------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'qpid/java/broker-core')

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
index f2ab47bfbb..14acd59928 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
@@ -26,6 +26,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.store.jdbc.ConnectionProvider;
@@ -34,28 +35,10 @@ public interface JDBCConnectionProviderFactory extends Pluggable
 {
     String getType();
 
-    ConnectionProvider getConnectionProvider(ConfiguredObject<?> parent, String connectionUrl)
+    ConnectionProvider getConnectionProvider(String connectionUrl, String username, String password, Map<String, String> providerAttributes)
             throws SQLException;
 
-    static final class TYPES
-    {
-        private TYPES()
-        {
-        }
-
-        public static Collection<String> get()
-        {
-            QpidServiceLoader<JDBCConnectionProviderFactory> qpidServiceLoader = new QpidServiceLoader<JDBCConnectionProviderFactory>();
-            Iterable<JDBCConnectionProviderFactory> factories = qpidServiceLoader.atLeastOneInstanceOf(JDBCConnectionProviderFactory.class);
-            List<String> names = new ArrayList<String>();
-            for(JDBCConnectionProviderFactory factory : factories)
-            {
-                names.add(factory.getType());
-            }
-            return Collections.unmodifiableCollection(names);
-        }
-    }
-
+    Set<String> getProviderAttributeNames();
 
     static final class FACTORIES
     {
-- 
cgit v1.2.1