[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuild...

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Dec 16 16:08:45 2014
New Revision: 712

URL: http://svn.shibboleth.net/view/utilities?rev=712&view=rev
Log:
Instead of deprecating, just remove Ssl -> TLS methods. 

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java?rev=712&r1=711&r2=712&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java Tue Dec 16 16:08:45 2014
@@ -66,7 +66,7 @@
  * </li>
  * 
  * <li>
- * If this builder's <code>connectionDisregardSslCertificate</code> is set to <code>true</code>, then any value
+ * If this builder's <code>connectionDisregardTLSCertificate</code> is set to <code>true</code>, then any value
  * previously set via the Apache builder's
  * {@link org.apache.http.impl.client.HttpClientBuilder#setSSLSocketFactory} will be
  * unconditionally overwritten.</li>
@@ -100,7 +100,7 @@
  * </p>
  * 
  * <ul>
- * <li>{@link #setConnectionDisregardSslCertificate(boolean)}</li>
+ * <li>{@link #setConnectionDisregardTLSCertificate(boolean)}</li>
  * <li>{@link #setSocketBufferSize(int)}</li>
  * <li>{@link #setHttpContentCharSet(String)}</li>
  * </ul>
@@ -315,40 +315,6 @@
      * </p>
      * 
      * @return whether the responder's SSL/TLS certificate should be ignored
-     * 
-     * @deprecated use {@link #isConnectionDisregardTLSCertificate()}
-     */
-    @Deprecated
-    public boolean isConnectionDisregardSslCertificate() {
-        return isConnectionDisregardTLSCertificate();
-    }
-
-    /**
-     * Sets whether the responder's SSL/TLS certificate should be ignored.
-     * 
-     * <p>
-     * This flag is overridden and ignored if a custom TLS socket factory is specified via
-     * {@link #setTLSSocketFactory}.
-     * </p>
-     * 
-     * @param disregard whether the responder's SSL/TLS certificate should be ignored
-     * 
-     * @deprecated use {@link #setConnectionDisregardTLSCertificate(boolean)}
-     */
-    @Deprecated
-    public void setConnectionDisregardSslCertificate(final boolean disregard) {
-        setConnectionDisregardTLSCertificate(disregard);
-    }
-    
-    /**
-     * Gets whether the responder's SSL/TLS certificate should be ignored.
-     * 
-     * <p>
-     * This flag is overridden and ignored if a custom TLS socket factory is specified via
-     * {@link #setTLSSocketFactory}.
-     * </p>
-     * 
-     * @return whether the responder's SSL/TLS certificate should be ignored
      */
     public boolean isConnectionDisregardTLSCertificate() {
         return connectionDisregardTLSCertificate;