You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/01/29 18:28:40 UTC
[1/2] qpid-jms git commit: tidy up paramater names/orders to clarify
things a bit
Repository: qpid-jms
Updated Branches:
refs/heads/master 24dd7e0dd -> 11f3106a7
tidy up paramater names/orders to clarify things a bit
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/11f3106a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/11f3106a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/11f3106a
Branch: refs/heads/master
Commit: 11f3106a727262cc6fc2a75c494a0fadf8b93664
Parents: 47b7087
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Jan 29 15:10:10 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Jan 29 17:28:06 2015 +0000
----------------------------------------------------------------------
.../qpid/jms/jndi/JmsInitialContextFactory.java | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/11f3106a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java
index 1a2db25..3d2a771 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java
@@ -62,14 +62,14 @@ public class JmsInitialContextFactory implements InitialContextFactory {
Hashtable<Object, Object> environmentCopy = new Hashtable<Object, Object>();
environmentCopy.putAll(environment);
- Map<String, Object> data = new ConcurrentHashMap<String, Object>();
- createConnectionFactories(environmentCopy, data);
- createQueues(data, environmentCopy);
- createTopics(data, environmentCopy);
+ Map<String, Object> bindings = new ConcurrentHashMap<String, Object>();
+ createConnectionFactories(environmentCopy, bindings);
+ createQueues(environmentCopy, bindings);
+ createTopics(environmentCopy, bindings);
// Add sub-contexts for dynamic creation on lookup.
// "dynamicQueues/<queue-name>"
- data.put("dynamicQueues", new LazyCreateContext() {
+ bindings.put("dynamicQueues", new LazyCreateContext() {
private static final long serialVersionUID = 6503881346214855588L;
@Override
@@ -79,7 +79,7 @@ public class JmsInitialContextFactory implements InitialContextFactory {
});
// "dynamicTopics/<topic-name>"
- data.put("dynamicTopics", new LazyCreateContext() {
+ bindings.put("dynamicTopics", new LazyCreateContext() {
private static final long serialVersionUID = 2019166796234979615L;
@Override
@@ -88,10 +88,10 @@ public class JmsInitialContextFactory implements InitialContextFactory {
}
});
- return createContext(environmentCopy, data);
+ return createContext(environmentCopy, bindings);
}
- private void createConnectionFactories(Hashtable<Object, Object> environment, Map<String, Object> data) throws NamingException {
+ private void createConnectionFactories(Hashtable<Object, Object> environment, Map<String, Object> bindings) throws NamingException {
String[] names = getConnectionFactoryNames(environment);
for (int i = 0; i < names.length; i++) {
JmsConnectionFactory factory = null;
@@ -103,15 +103,15 @@ public class JmsInitialContextFactory implements InitialContextFactory {
throw new NamingException("Invalid broker URL");
}
- data.put(name, factory);
+ bindings.put(name, factory);
}
}
// Implementation methods
// -------------------------------------------------------------------------
- protected ReadOnlyContext createContext(Hashtable<Object, Object> environment, Map<String, Object> data) {
- return new ReadOnlyContext(environment, data);
+ protected ReadOnlyContext createContext(Hashtable<Object, Object> environment, Map<String, Object> bindings) {
+ return new ReadOnlyContext(environment, bindings);
}
protected JmsConnectionFactory createConnectionFactory(String name, Hashtable<Object, Object> environment) throws URISyntaxException {
@@ -147,24 +147,24 @@ public class JmsInitialContextFactory implements InitialContextFactory {
return DEFAULT_CONNECTION_FACTORY_NAMES;
}
- protected void createQueues(Map<String, Object> data, Hashtable<Object, Object> environment) {
+ protected void createQueues(Hashtable<Object, Object> environment, Map<String, Object> bindings) {
for (Iterator<Entry<Object, Object>> iter = environment.entrySet().iterator(); iter.hasNext();) {
Map.Entry<Object, Object> entry = iter.next();
String key = entry.getKey().toString();
if (key.startsWith(queuePrefix)) {
String jndiName = key.substring(queuePrefix.length());
- data.put(jndiName, createQueue(entry.getValue().toString()));
+ bindings.put(jndiName, createQueue(entry.getValue().toString()));
}
}
}
- protected void createTopics(Map<String, Object> data, Hashtable<Object, Object> environment) {
+ protected void createTopics(Hashtable<Object, Object> environment, Map<String, Object> bindings) {
for (Iterator<Entry<Object, Object>> iter = environment.entrySet().iterator(); iter.hasNext();) {
Map.Entry<Object, Object> entry = iter.next();
String key = entry.getKey().toString();
if (key.startsWith(topicPrefix)) {
String jndiName = key.substring(topicPrefix.length());
- data.put(jndiName, createTopic(entry.getValue().toString()));
+ bindings.put(jndiName, createTopic(entry.getValue().toString()));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms git commit: remove unused imports
Posted by ro...@apache.org.
remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/47b70879
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/47b70879
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/47b70879
Branch: refs/heads/master
Commit: 47b708791e57cb8526a6cb06f697ec15dc77aa5b
Parents: 24dd7e0
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Jan 29 15:03:34 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Jan 29 17:28:06 2015 +0000
----------------------------------------------------------------------
.../src/test/java/org/apache/qpid/jms/JmsQueueTest.java | 2 --
.../src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java | 2 --
.../src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java | 2 --
.../src/test/java/org/apache/qpid/jms/JmsTopicTest.java | 2 --
4 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/47b70879/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java
index cbfd2b0..5e4c3ed 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java
@@ -29,8 +29,6 @@ import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Map;
-import javax.jms.Destination;
-
import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/47b70879/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java
index 8bc7ac7..deb2535 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java
@@ -29,8 +29,6 @@ import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Map;
-import javax.jms.Destination;
-
import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/47b70879/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java
index 1d90c30..877c799 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java
@@ -29,8 +29,6 @@ import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Map;
-import javax.jms.Destination;
-
import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/47b70879/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java
index 666a182..dfa3938 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java
@@ -29,8 +29,6 @@ import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Map;
-import javax.jms.Destination;
-
import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.junit.Test;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org