vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Deprecate legacy disco-publish API of ServiceDiscoveryManager

This commit is contained in:
Florian Schmaus 2018-02-21 20:25:44 +01:00
parent 41f5cf8435
commit ec4be1963a
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
View File

@ -278,7 +278,11 @@ public final class AdHocCommandManager extends Manager {
* @throws XMPPException if the operation failed for some reason. * @throws XMPPException if the operation failed for some reason.
* @throws SmackException if there was no response from the server. * @throws SmackException if there was no response from the server.
* @throws InterruptedException * @throws InterruptedException
* @deprecated This method uses no longer existent XEP-0030 features and will be removed.
*/ */
@SuppressWarnings("deprecation")
@Deprecated
// TODO: Remove in Smack 4.4.
public void publishCommands(Jid jid) throws XMPPException, SmackException, InterruptedException { public void publishCommands(Jid jid) throws XMPPException, SmackException, InterruptedException {
// Collects the commands to publish as items // Collects the commands to publish as items
DiscoverItems discoverItems = new DiscoverItems(); DiscoverItems discoverItems = new DiscoverItems();

12
smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
View File

@ -592,7 +592,10 @@ public final class ServiceDiscoveryManager extends Manager {
* @throws NoResponseException * @throws NoResponseException
* @throws NotConnectedException * @throws NotConnectedException
* @throws InterruptedException * @throws InterruptedException
* @deprecated The disco-publish feature was removed from XEP-0030 in 2008 in favor of XEP-0060: Publish-Subscribe.
*/ */
@Deprecated
// TODO: Remove in Smack 4.4
public boolean canPublishItems(Jid entityID) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { public boolean canPublishItems(Jid entityID) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
DiscoverInfo info = discoverInfo(entityID); DiscoverInfo info = discoverInfo(entityID);
return canPublishItems(info); return canPublishItems(info);
@ -606,7 +609,10 @@ public final class ServiceDiscoveryManager extends Manager {
* *
* @param info the discover info stanza(/packet) to check. * @param info the discover info stanza(/packet) to check.
* @return true if the server supports publishing of items. * @return true if the server supports publishing of items.
* @deprecated The disco-publish feature was removed from XEP-0030 in 2008 in favor of XEP-0060: Publish-Subscribe.
*/ */
@Deprecated
// TODO: Remove in Smack 4.4
public static boolean canPublishItems(DiscoverInfo info) { public static boolean canPublishItems(DiscoverInfo info) {
return info.containsFeature("http://jabber.org/protocol/disco#publish"); return info.containsFeature("http://jabber.org/protocol/disco#publish");
} }
@ -623,7 +629,10 @@ public final class ServiceDiscoveryManager extends Manager {
* @throws NoResponseException * @throws NoResponseException
* @throws NotConnectedException * @throws NotConnectedException
* @throws InterruptedException * @throws InterruptedException
* @deprecated The disco-publish feature was removed from XEP-0030 in 2008 in favor of XEP-0060: Publish-Subscribe.
*/ */
@Deprecated
// TODO: Remove in Smack 4.4
public void publishItems(Jid entityID, DiscoverItems discoverItems) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { public void publishItems(Jid entityID, DiscoverItems discoverItems) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
publishItems(entityID, null, discoverItems); publishItems(entityID, null, discoverItems);
} }
@ -641,7 +650,10 @@ public final class ServiceDiscoveryManager extends Manager {
* @throws NoResponseException if there was no response from the server. * @throws NoResponseException if there was no response from the server.
* @throws NotConnectedException * @throws NotConnectedException
* @throws InterruptedException * @throws InterruptedException
* @deprecated The disco-publish feature was removed from XEP-0030 in 2008 in favor of XEP-0060: Publish-Subscribe.
*/ */
@Deprecated
// TODO: Remove in Smack 4.4
public void publishItems(Jid entityID, String node, DiscoverItems discoverItems) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException public void publishItems(Jid entityID, String node, DiscoverItems discoverItems) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
{ {
discoverItems.setType(IQ.Type.set); discoverItems.setType(IQ.Type.set);