qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject qpid-jms git commit: Remove the async bit from the create methods, there's only one now.
Date Wed, 03 Dec 2014 23:38:05 GMT
Repository: qpid-jms
Updated Branches:
  refs/heads/master ac67160e7 -> cfbdeabc4


Remove the async bit from the create methods, there's only one now. 

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/cfbdeabc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/cfbdeabc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/cfbdeabc

Branch: refs/heads/master
Commit: cfbdeabc4fc74523f251837a45f6463db79838dd
Parents: ac67160
Author: Timothy Bish <tabish121@gmail.com>
Authored: Wed Dec 3 18:37:58 2014 -0500
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Wed Dec 3 18:37:58 2014 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/qpid/jms/JmsConnectionFactory.java    | 2 +-
 .../java/org/apache/qpid/jms/provider/ProviderFactory.java     | 2 +-
 .../apache/qpid/jms/provider/failover/FailoverProvider.java    | 2 +-
 .../apache/qpid/jms/discovery/JmsDiscoveryProviderTest.java    | 6 +++---
 .../org/apache/qpid/jms/failover/FailoverProviderTest.java     | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cfbdeabc/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
index 3cf2e86..72be74f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
@@ -249,7 +249,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
         Provider result = null;
 
         try {
-            result = ProviderFactory.createAsync(brokerURI);
+            result = ProviderFactory.create(brokerURI);
         } catch (Exception ex) {
             LOG.error("Failed to create JMS Provider instance for: {}", brokerURI.getScheme());
             LOG.trace("Error: ", ex);

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cfbdeabc/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
index 0b6cd7c..b3c9664 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
@@ -63,7 +63,7 @@ public abstract class ProviderFactory {
      *
      * @throws Exception if an error occurs while creating the AsyncProvider instance.
      */
-    public static Provider createAsync(URI remoteURI) throws Exception {
+    public static Provider create(URI remoteURI) throws Exception {
         Provider result = null;
 
         try {

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cfbdeabc/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
index 4539687..24be034 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
@@ -527,7 +527,7 @@ public class FailoverProvider extends DefaultProviderListener implements
Provide
                     try {
                         LOG.debug("Attempting connection to: {}", target);
                         JmsSslContext.setCurrentSslContext(sslContext);
-                        Provider provider = ProviderFactory.createAsync(target);
+                        Provider provider = ProviderFactory.create(target);
                         initializeNewConnection(provider);
                         return;
                     } catch (Throwable e) {

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cfbdeabc/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsDiscoveryProviderTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsDiscoveryProviderTest.java
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsDiscoveryProviderTest.java
index 3d53957..a117687 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsDiscoveryProviderTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsDiscoveryProviderTest.java
@@ -64,7 +64,7 @@ public class JmsDiscoveryProviderTest {
     @Test(timeout=30000)
     public void testCreateDiscvoeryProvider() throws Exception {
         URI discoveryUri = new URI("discovery:multicast://default");
-        Provider provider = DiscoveryProviderFactory.createAsync(discoveryUri);
+        Provider provider = DiscoveryProviderFactory.create(discoveryUri);
         assertNotNull(provider);
 
         DefaultProviderListener listener = new DefaultProviderListener();
@@ -77,7 +77,7 @@ public class JmsDiscoveryProviderTest {
     public void testStartFailsWithNoListener() throws Exception {
         URI discoveryUri = new URI("discovery:multicast://default");
         Provider provider =
-            DiscoveryProviderFactory.createAsync(discoveryUri);
+            DiscoveryProviderFactory.create(discoveryUri);
         assertNotNull(provider);
         provider.start();
         provider.close();
@@ -86,7 +86,7 @@ public class JmsDiscoveryProviderTest {
     @Test(timeout=30000, expected=IOException.class)
     public void testCreateFailsWithUnknownAgent() throws Exception {
         URI discoveryUri = new URI("discovery:unknown://default");
-        Provider provider = DiscoveryProviderFactory.createAsync(discoveryUri);
+        Provider provider = DiscoveryProviderFactory.create(discoveryUri);
         provider.close();
     }
 

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cfbdeabc/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/FailoverProviderTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/FailoverProviderTest.java
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/FailoverProviderTest.java
index 7e4e5b3..c1bfb58 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/FailoverProviderTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/FailoverProviderTest.java
@@ -41,7 +41,7 @@ public class FailoverProviderTest extends AmqpTestSupport {
     @Test(timeout=60000)
     public void testFailoverCreate() throws Exception {
         URI brokerURI = new URI("failover:" + getBrokerAmqpConnectionURI());
-        Provider asyncProvider = FailoverProviderFactory.createAsync(brokerURI);
+        Provider asyncProvider = FailoverProviderFactory.create(brokerURI);
         assertNotNull(asyncProvider);
         FailoverProvider provider = (FailoverProvider) asyncProvider;
         assertNotNull(provider);
@@ -52,7 +52,7 @@ public class FailoverProviderTest extends AmqpTestSupport {
         URI brokerURI = new URI("failover://(" + getBrokerAmqpConnectionURI() + ")" +
                                 "?maxReconnectDelay=1000&useExponentialBackOff=false"
+
                                 "&maxReconnectAttempts=10&startupMaxReconnectAttempts=20");
-        Provider asyncProvider = FailoverProviderFactory.createAsync(brokerURI);
+        Provider asyncProvider = FailoverProviderFactory.create(brokerURI);
         assertNotNull(asyncProvider);
         FailoverProvider provider = (FailoverProvider) asyncProvider;
         assertNotNull(provider);
@@ -67,7 +67,7 @@ public class FailoverProviderTest extends AmqpTestSupport {
     public void testStartupReconnectAttempts() throws Exception {
         URI brokerURI = new URI("failover://(amqp://localhost:61616)" +
                                 "?maxReconnectDelay=100&startupMaxReconnectAttempts=5");
-        Provider asyncProvider = FailoverProviderFactory.createAsync(brokerURI);
+        Provider asyncProvider = FailoverProviderFactory.create(brokerURI);
         assertNotNull(asyncProvider);
         FailoverProvider provider = (FailoverProvider) asyncProvider;
         assertNotNull(provider);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message