Remove deprecated methods

igniterealtime · Apr 15, 2018 · 40397e1 · 40397e1
1 parent e893681
commit 40397e1
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 71 deletions.
diff --git a/jxmpp-core/src/main/java/org/jxmpp/util/XmppStringUtils.java b/jxmpp-core/src/main/java/org/jxmpp/util/XmppStringUtils.java
@@ -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

diff --git a/jxmpp-jid/src/main/java/org/jxmpp/jid/impl/JidCreate.java b/jxmpp-jid/src/main/java/org/jxmpp/jid/impl/JidCreate.java
@@ -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}.

diff --git a/jxmpp-util-cache/src/main/java/org/jxmpp/util/cache/Cache.java b/jxmpp-util-cache/src/main/java/org/jxmpp/util/cache/Cache.java
@@ -27,16 +27,6 @@ public interface Cache<K, V> {
 	 */
 	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}.
 	 *

diff --git a/jxmpp-util-cache/src/main/java/org/jxmpp/util/cache/ExpirationCache.java b/jxmpp-util-cache/src/main/java/org/jxmpp/util/cache/ExpirationCache.java
@@ -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);

diff --git a/jxmpp-util-cache/src/main/java/org/jxmpp/util/cache/LruCache.java b/jxmpp-util-cache/src/main/java/org/jxmpp/util/cache/LruCache.java
@@ -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;