Permalink
Browse files

Remove deprecated methods

  • Loading branch information...
Flowdalic committed Apr 15, 2018
1 parent e893681 commit 40397e1cf011420368a45aec805fbccec528785e
@@ -1,6 +1,6 @@
/**
*
* Copyright © 2014-2016 Florian Schmaus
* Copyright © 2014-2018 Florian Schmaus
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -95,21 +95,6 @@ public static String parseResource(String jid) {
}
}

/**
* Returns the JID with any resource information removed. For example, for
* the address "matt@jivesoftware.com/Smack", "matt@jivesoftware.com" would
* be returned.
*
* @param jid
* the XMPP JID.
* @return the bare XMPP JID without resource information.
* @deprecated use {@link #parseBareJid(String)} instead
*/
@Deprecated
public static String parseBareAddress(String jid) {
return parseBareJid(jid);
}

/**
* Returns the JID with any resource information removed. For example, for
* the address "matt@jivesoftware.com/Smack", "matt@jivesoftware.com" would
@@ -844,19 +844,6 @@ public static EntityFullJid entityFullFrom(EntityBareJid bareJid, Resourcepart r
return new LocalDomainAndResourcepartJid(bareJid, resource);
}

/**
* Deprecated.
*
* @param jid the JID.
* @return a DopmainBareJid
* @throws XmppStringprepException if an error happens.
* @deprecated use {@link #domainBareFrom(String)} instead
*/
@Deprecated
public static DomainBareJid serverBareFrom(String jid) throws XmppStringprepException {
return domainBareFrom(jid);
}

/**
* Like {@link #domainBareFrom(CharSequence)} but does throw an unchecked {@link IllegalArgumentException} instead of a
* {@link XmppStringprepException}.
@@ -918,32 +905,6 @@ public static DomainBareJid domainBareFrom(Domainpart domainpart) {
return new DomainpartJid(domainpart);
}

/**
* Deprecated.
*
* @param jid the JID.
* @return a DomainFullJid
* @throws XmppStringprepException if an error happens.
* @deprecated use {@link #domainFullFrom(String)} instead
*/
@Deprecated
public static DomainFullJid serverFullFrom(String jid) throws XmppStringprepException {
return donmainFullFrom(jid);
}

/**
* Get a domain full JID from the given String.
*
* @param jid the JID.
* @return a DomainFullJid.
* @throws XmppStringprepException if an error happens.
* @deprecated use {@link #domainFullFrom(String)} instead.
*/
@Deprecated
public static DomainFullJid donmainFullFrom(String jid) throws XmppStringprepException {
return domainFullFrom(jid);
}

/**
* Like {@link #domainFullFrom(CharSequence)} but does throw an unchecked {@link IllegalArgumentException} instead of a
* {@link XmppStringprepException}.
@@ -27,16 +27,6 @@
*/
V put(K key, V value);

/**
* Returns the value of the specified key, or {@code null}.
*
* @param key the key.
* @return the value found in the cache, or {@code null}.
* @deprecated Use {@link #lookup(Object)} instead.
*/
@Deprecated
V get(Object key);

/**
* Returns the value of the specified key, or {@code null}.
*
@@ -1,6 +1,6 @@
/**
*
* Copyright © 2014-2016 Florian Schmaus
* Copyright © 2014-2018 Florian Schmaus
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -76,8 +76,6 @@ public V lookup(K key) {
return get(key);
}

@SuppressWarnings("deprecation")
@Deprecated
@Override
public V get(Object key) {
ExpireElement<V> v = cache.get(key);
@@ -1,6 +1,6 @@
/**
*
* Copyright 2003-2005 Jive Software, 2014-2016 Florian Schmaus
* Copyright 2003-2005 Jive Software, 2014-2018 Florian Schmaus
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -88,8 +88,6 @@ public final V lookup(K key) {
return get(key);
}

@SuppressWarnings("deprecation")
@Deprecated
@Override
public final V get(Object key) {
V cacheObject;

0 comments on commit 40397e1

Please sign in to comment.