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/20 15:40:48 UTC
[7/9] qpid-jms git commit: clean up method signatures to remove
warnings
clean up method signatures to remove warnings
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a2f50a15
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a2f50a15
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a2f50a15
Branch: refs/heads/master
Commit: a2f50a1546f3421b20b6d5b544a707a1de4720d2
Parents: 3c27692
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Jan 20 12:43:46 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Jan 20 12:43:46 2015 +0000
----------------------------------------------------------------------
.../qpid/jms/jndi/JmsInitialContextFactory.java | 29 ++++++++++----------
1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a2f50a15/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 22dfc62..0f4a399 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
@@ -23,6 +23,7 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
@@ -54,9 +55,9 @@ public class JmsInitialContextFactory implements InitialContextFactory {
private String queuePrefix = "queue.";
private String topicPrefix = "topic.";
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings("unchecked")
@Override
- public Context getInitialContext(Hashtable environment) throws NamingException {
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
// Copy the environment to ensure we don't modify/reference it, it belongs to the caller.
Hashtable<Object, Object> environmentCopy = new Hashtable<Object, Object>();
environmentCopy.putAll(environment);
@@ -109,15 +110,15 @@ public class JmsInitialContextFactory implements InitialContextFactory {
// Implementation methods
// -------------------------------------------------------------------------
- protected ReadOnlyContext createContext(Hashtable environment, Map<String, Object> data) {
+ protected ReadOnlyContext createContext(Hashtable<Object, Object> environment, Map<String, Object> data) {
return new ReadOnlyContext(environment, data);
}
- protected JmsConnectionFactory createConnectionFactory(String name, Hashtable environment) throws URISyntaxException {
- Hashtable temp = new Hashtable(environment);
+ protected JmsConnectionFactory createConnectionFactory(String name, Hashtable<Object, Object> environment) throws URISyntaxException {
+ Hashtable<Object, Object> temp = new Hashtable<Object, Object>(environment);
String prefix = connectionFactoryPrefix + name + ".";
- for (Iterator iter = environment.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Iterator<Entry<Object, Object>> iter = environment.entrySet().iterator(); iter.hasNext();) {
+ Map.Entry<Object, Object> entry = iter.next();
String key = (String) entry.getKey();
if (key.startsWith(prefix)) {
// Rename the key...
@@ -129,7 +130,7 @@ public class JmsInitialContextFactory implements InitialContextFactory {
return createConnectionFactory(temp);
}
- protected String[] getConnectionFactoryNames(Map environment) {
+ protected String[] getConnectionFactoryNames(Map<Object, Object> environment) {
String factoryNames = (String) environment.get("factories");
if (factoryNames != null) {
List<String> list = new ArrayList<String>();
@@ -146,9 +147,9 @@ public class JmsInitialContextFactory implements InitialContextFactory {
return DEFAULT_CONNECTION_FACTORY_NAMES;
}
- protected void createQueues(Map<String, Object> data, Hashtable environment) {
- for (Iterator iter = environment.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
+ protected void createQueues(Map<String, Object> data, Hashtable<Object, Object> environment) {
+ 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());
@@ -157,9 +158,9 @@ public class JmsInitialContextFactory implements InitialContextFactory {
}
}
- protected void createTopics(Map<String, Object> data, Hashtable environment) {
- for (Iterator iter = environment.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
+ protected void createTopics(Map<String, Object> data, Hashtable<Object, Object> environment) {
+ 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());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org