updates to remove or suppress some more type 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/3ffb4e5e Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/3ffb4e5e Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/3ffb4e5e Branch: refs/heads/master Commit: 3ffb4e5ef2a3023d194e7212b1973f3cca94ee0c Parents: 891542a Author: Robert Gemmell <[email protected]> Authored: Tue Jan 20 14:29:04 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Tue Jan 20 14:29:31 2015 +0000 ---------------------------------------------------------------------- .../org/apache/qpid/jms/jndi/JNDIStorable.java | 1 + .../apache/qpid/jms/jndi/LazyCreateContext.java | 1 + .../apache/qpid/jms/jndi/ReadOnlyContext.java | 25 ++++++++++---------- 3 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3ffb4e5e/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java index 1dfd0b3..358ff11 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java @@ -91,6 +91,7 @@ public abstract class JNDIStorable implements Referenceable, Externalizable { * @throws ClassNotFoundException * @see java.io.Externalizable#readExternal(java.io.ObjectInput) */ + @SuppressWarnings("unchecked") @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { Map<String, String> props = (Map<String, String>) in.readObject(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3ffb4e5e/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/LazyCreateContext.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/LazyCreateContext.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/LazyCreateContext.java index 11b52fe..b86c761 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/LazyCreateContext.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/LazyCreateContext.java @@ -24,6 +24,7 @@ import javax.naming.NamingException; * * @since 1.0 */ +@SuppressWarnings("unchecked") public abstract class LazyCreateContext extends ReadOnlyContext { private static final long serialVersionUID = 5131341840091473967L; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3ffb4e5e/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/ReadOnlyContext.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/ReadOnlyContext.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/ReadOnlyContext.java index 60181d1..5f6163e 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/ReadOnlyContext.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/ReadOnlyContext.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import javax.naming.Binding; import javax.naming.CompositeName; @@ -58,7 +59,7 @@ import javax.naming.spi.NamingManager; * String envEntry2 = (String) componentContext.lookup("env/myEntry2"); * </code> */ -@SuppressWarnings("unchecked") +@SuppressWarnings({"unchecked", "rawtypes"}) public class ReadOnlyContext implements Context, Serializable { public static final String SEPARATOR = "/"; @@ -108,7 +109,7 @@ public class ReadOnlyContext implements Context, Serializable { frozen = true; } - public ReadOnlyContext(Hashtable environment, Map bindings, String nameInNamespace) { + public ReadOnlyContext(Hashtable environment, Map<String, Object> bindings, String nameInNamespace) { this(environment, bindings); this.nameInNamespace = nameInNamespace; } @@ -175,9 +176,9 @@ public class ReadOnlyContext implements Context, Serializable { ReadOnlyContext readOnlyContext = (ReadOnlyContext) o; String remainder = name.substring(pos + 1); Map<String, Object> subBindings = readOnlyContext.internalBind(remainder, value); - for (Iterator iterator = subBindings.entrySet().iterator(); iterator.hasNext();) { - Map.Entry entry = (Map.Entry) iterator.next(); - String subName = segment + "/" + (String) entry.getKey(); + for (Iterator<Entry<String, Object>> iterator = subBindings.entrySet().iterator(); iterator.hasNext();) { + Entry<String, Object> entry = iterator.next(); + String subName = segment + "/" + entry.getKey(); Object bound = entry.getValue(); treeBindings.put(subName, bound); newBindings.put(subName, bound); @@ -410,7 +411,7 @@ public class ReadOnlyContext implements Context, Serializable { } private abstract class LocalNamingEnumeration implements NamingEnumeration { - private final Iterator i = bindings.entrySet().iterator(); + private final Iterator<Entry<String, Object>> i = bindings.entrySet().iterator(); @Override public boolean hasMore() throws NamingException { @@ -422,8 +423,8 @@ public class ReadOnlyContext implements Context, Serializable { return i.hasNext(); } - protected Map.Entry getNext() { - return (Map.Entry) i.next(); + protected Map.Entry<String, Object> getNext() { + return i.next(); } @Override @@ -442,8 +443,8 @@ public class ReadOnlyContext implements Context, Serializable { @Override public Object nextElement() { - Map.Entry entry = getNext(); - return new NameClassPair((String) entry.getKey(), entry.getValue().getClass().getName()); + Map.Entry<String, Object> entry = getNext(); + return new NameClassPair(entry.getKey(), entry.getValue().getClass().getName()); } } @@ -458,8 +459,8 @@ public class ReadOnlyContext implements Context, Serializable { @Override public Object nextElement() { - Map.Entry entry = getNext(); - return new Binding((String) entry.getKey(), entry.getValue()); + Map.Entry<String, Object> entry = getNext(); + return new Binding(entry.getKey(), entry.getValue()); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
