Merge pull request #406 from sco0ter/deprecated

Remove methods, which are both deprecated and unused.

src/java/org/jivesoftware/database/DbConnectionManager.java

@@ -459,25 +459,6 @@ public class DbConnectionManager {
         }
     }
 
-    /**
-     * Creates a scroll insensitive Statement if the JDBC driver supports it, or a normal
-     * Statement otherwise.
-     *
-     * @param con the database connection.
-     * @return a Statement
-     * @throws SQLException if an error occurs.
-     */
-    @Deprecated
-    public static Statement createScrollableStatement(Connection con) throws SQLException {
-        if (isScrollResultsSupported()) {
-            return con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
-                    ResultSet.CONCUR_READ_ONLY);
-        }
-        else {
-            return con.createStatement();
-        }
-    }
-
     /**
      * Creates a scroll insensitive PreparedStatement if the JDBC driver supports it, or a normal
      * PreparedStatement otherwise.

src/java/org/jivesoftware/openfire/XMPPServerInfo.java

@@ -39,33 +39,14 @@ public interface XMPPServerInfo {
      *
      * @return the version of the server.
      */
-    public Version getVersion();
-
-    /**
-     * Obtain the server name (IP address or hostname).
-     *
-     * @return the server's name as an IP address or host name.
-     * @deprecated replaced by {@link #getXMPPDomain()}
-     */
-    @Deprecated
-    public String getName();
-
-    /**
-     * Set the server name (IP address or hostname). The server
-     * must be restarted for this change to take effect.
-     *
-     * @param serverName the server's name as an IP address or host name.
-     * @deprecated replaced by {@link #setXMPPDomain(String)}
-     */
-    @Deprecated
-    public void setName(String serverName);
+    Version getVersion();
 
     /**
      * Obtain the host name (IP address or hostname) of this server node.
      *
      * @return the server's host name as an IP address or host name.
      */
-    public String getHostname();
+    String getHostname();
 
     /**
      * Obtain the server XMPP domain name. Note that, if unconfigured, the
@@ -73,7 +54,7 @@ public interface XMPPServerInfo {
      *
      * @return the name of the XMPP domain that this server is part of.
      */
-    public String getXMPPDomain();
+    String getXMPPDomain();
 
     /**
      * Set the server XMPP domain name. The server must be
@@ -82,19 +63,19 @@ public interface XMPPServerInfo {
      * @param domainName
      *             the XMPP domain that this server is part of.
      */
-    public void setXMPPDomain(String domainName);
+    void setXMPPDomain(String domainName);
 
     /**
      * Obtain the date when the server was last started.
      *
      * @return the date the server was started or null if server has not been started.
      */
-    public Date getLastStarted();
+    Date getLastStarted();
 
     /**
      * Obtain the server ports active on this server.
      *
      * @return an iterator over the server ports for this server.
      */
-    public Collection<ServerPort> getServerPorts();
+    Collection<ServerPort> getServerPorts();
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/launcher/GraphicUtils.java

@@ -245,19 +245,6 @@ public final class GraphicUtils {
         return false;
     }
 
-    /**
-     * Returns the first component in the tree of <code>c</code> that can accept
-     * the focus.
-     *
-     * @param c the root of the component hierarchy to search
-     * @see #focusComponentOrChild
-     * @deprecated replaced by {@link #getFocusableComponentOrChild(Component, boolean)}
-     */
-    @Deprecated
-	public static Component getFocusableComponentOrChild(Component c) {
-        return getFocusableComponentOrChild(c, false);
-    }
-
     /**
      * Returns the first component in the tree of <code>c</code> that can accept
      * the focus.

src/java/org/jivesoftware/openfire/muc/spi/IQMUCSearchHandler.java

@@ -390,32 +390,4 @@ public class IQMUCSearchHandler
 		}
 		return room.isPublicRoom();
 	}
-
-	/**
-	 * Returns the first value from the FormField, or 'null' if no value has
-	 * been set.
-	 * 
-	 * @param formField
-	 *            The field from which to return the first value.
-	 * @return String based value, or 'null' if the FormField has no values.
-	 * @deprecated replaced by {@link FormField#getFirstValue()}
-	 */
-	@Deprecated
-	public static String getFirstValue(FormField formField)
-	{
-		if (formField == null)
-		{
-			throw new IllegalArgumentException(
-				"The argument 'formField' cannot be null.");
-		}
-
-		List<String> it = formField.getValues();
-
-		if (it.isEmpty())
-		{
-			return null;
-		}
-
-		return it.get(0);
-	}
 }

src/java/org/jivesoftware/openfire/net/DNSUtil.java

@@ -66,30 +66,6 @@ public class DNSUtil {
         }
     }
 
-    /**
-     * Returns the host name and port that the specified XMPP server can be
-     * reached at for server-to-server communication. A DNS lookup for a SRV
-     * record in the form "_xmpp-server._tcp.example.com" is attempted, according
-     * to section 14.4 of RFC 3920. If that lookup fails, a lookup in the older form
-     * of "_jabber._tcp.example.com" is attempted since servers that implement an
-     * older version of the protocol may be listed using that notation. If that
-     * lookup fails as well, it's assumed that the XMPP server lives at the
-     * host resolved by a DNS lookup at the specified domain on the specified default port.<p>
-     *
-     * As an example, a lookup for "example.com" may return "im.example.com:5269".
-     *
-     * @param domain the domain.
-     * @param defaultPort default port to return if the DNS look up fails.
-     * @return a HostAddress, which encompasses the hostname and port that the XMPP
-     *      server can be reached at for the specified domain.
-     * @deprecated replaced with support for multiple srv records, see 
-     *      {@link #resolveXMPPDomain(String, int)}
-     */
-    @Deprecated
-    public static HostAddress resolveXMPPServerDomain(String domain, int defaultPort) {
-        return resolveXMPPDomain(domain, defaultPort).get(0);
-    }
-
     /**
      * Returns a sorted list of host names and ports that the specified XMPP domain
      * can be reached at for server-to-server communication. A DNS lookup for a SRV

src/java/org/jivesoftware/openfire/net/SASLAuthentication.java

@@ -644,14 +644,6 @@ public class SASLAuthentication {
         return false;
     }
 
-    /**
-     * @deprecated Use {@link #verifyCertificates(Certificate[], String, boolean)} instead.
-     */
-    @Deprecated
-    public static boolean verifyCertificates(Certificate[] chain, String hostname) {
-        return verifyCertificates( chain, hostname, true );
-    }
-
     public static boolean verifyCertificates(Certificate[] chain, String hostname, boolean isS2S) {
         final KeyStore keyStore   = SSLConfig.getStore( Purpose.SOCKETBASED_IDENTITYSTORE );
         final KeyStore trustStore = SSLConfig.getStore( isS2S ? Purpose.SOCKETBASED_S2S_TRUSTSTORE : Purpose.SOCKETBASED_C2S_TRUSTSTORE );

src/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java

@@ -66,18 +66,6 @@ public class XMPPServerInfoImpl implements XMPPServerInfo {
         return ver;
     }
 
-    @Override
-    @Deprecated
-    public String getName() {
-        return getXMPPDomain();
-    }
-
-    @Override
-    @Deprecated
-    public void setName(String serverName) {
-        setXMPPDomain(serverName);
-    }
-
     @Override
     public String getHostname()
 	{

src/java/org/jivesoftware/util/CertificateManager.java

@@ -62,7 +62,6 @@ import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
 import org.bouncycastle.x509.X509V3CertificateGenerator;
 import org.jivesoftware.openfire.keystore.CertificateStoreConfig;
-import org.jivesoftware.openfire.keystore.CertificateStoreConfigException;
 import org.jivesoftware.util.cert.CertificateIdentityMapping;
 import org.jivesoftware.util.cert.CNCertificateIdentityMapping;
 import org.jivesoftware.util.cert.SANCertificateIdentityMapping;
@@ -143,33 +142,6 @@ public class CertificateManager {
         }
     }
 
-    /**
-     * @Deprecated Use {@link CertificateStoreConfig#delete(String)} instead.
-     */
-    @Deprecated
-    public static void deleteCertificate(CertificateStoreConfig storeConfig, String alias) throws GeneralSecurityException, IOException, CertificateStoreConfigException
-    {
-        final KeyStore store = storeConfig.getStore();
-        if (!store.containsAlias( alias ) )
-        {
-            Log.info( "Unable to delete certificate for alias '"+alias+"' from store, as the store does not contain a certificate for that alias." );
-            return;
-        }
-
-        storeConfig.getStore().deleteEntry( alias );
-        storeConfig.persist();
-
-        // Notify listeners that a new certificate has been removed.
-        for (CertificateEventListener listener : listeners) {
-            try {
-                listener.certificateDeleted(store, alias);
-            }
-            catch (Exception e) {
-                Log.warn( "An exception occurred while notifying CertificateEventListener " + listener, e );
-            }
-        }
-    }
-
     /**
      * Decide whether or not to trust the given supplied certificate chain, returning the
      * End Entity Certificate in this case where it can, and null otherwise.