Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-09 10:19:41 +02:00
Code Issues Releases Wiki Activity

Do not have Stanza.getExtension(String, String) return a generic type

Browse source 
Returning a generic would allow for

List<ExtensionElement> list = stanza.getExtension("foo", "bar");

to compile (Note the we are calling getExtension(), not
getExtension*s*()).

Users are encouraged to use the type safe getExtension(Class<? extends
ExtensionElement) variant instead.

Fixes SMACK-825.
This commit is contained in:
Florian Schmaus 2020-04-05 22:10:05 +02:00
parent 62916b8490
commit 07da9ffb48
65 changed files with 207 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

1
smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
View file

@ -26,7 +26,6 @@ import java.util.Set;
import javax.xml.namespace.QName;
import org.jivesoftware.smack.packet.Message.Thread;
import org.jivesoftware.smack.util.EqualsUtil;
import org.jivesoftware.smack.util.HashCode;
import org.jivesoftware.smack.util.Objects;

11
smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
View file

@ -356,11 +356,9 @@ public abstract class Stanza implements StanzaView, TopLevelStreamElement {
*
* @param elementName the XML element name of the extension. (May be null)
* @param namespace the XML element namespace of the extension.
* @param <PE> type of the ExtensionElement.
* @return the extension, or <code>null</code> if it doesn't exist.
*/
@SuppressWarnings("unchecked")
public final <PE extends ExtensionElement> PE getExtension(String elementName, String namespace) {
public final ExtensionElement getExtension(String elementName, String namespace) {
if (namespace == null) {
return null;
}
@ -369,14 +367,13 @@ public abstract class Stanza implements StanzaView, TopLevelStreamElement {
if (packetExtension == null) {
return null;
}
return (PE) packetExtension;
return packetExtension;
}
@SuppressWarnings("unchecked")
@Override
public final <E extends ExtensionElement> E getExtension(QName qname) {
public final ExtensionElement getExtension(QName qname) {
synchronized (extensionElements) {
return (E) extensionElements.getFirst(qname);
return extensionElements.getFirst(qname);
}
}

5
smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaBuilder.java
View file

@ -211,10 +211,9 @@ public abstract class StanzaBuilder<B extends StanzaBuilder<B>> implements Stanz
return stanzaError;
}
@SuppressWarnings("unchecked")
@Override
public final <E extends ExtensionElement> E getExtension(QName qname) {
return (E) extensionElements.getFirst(qname);
public final ExtensionElement getExtension(QName qname) {
return extensionElements.getFirst(qname);
}
@Override

2
smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaView.java
View file

@ -61,7 +61,7 @@ public interface StanzaView extends XmlLangElement {
*/
StanzaError getError();
<E extends ExtensionElement> E getExtension(QName qname);
ExtensionElement getExtension(QName qname);
default boolean hasExtension(QName qname) {
return getExtension(qname) != null;