[java-support] 03/03: IDP-1397: Removal of deprecated features

[Brent Putman]

This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch master
in repository java-support.

View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=f9537b08ba1537253083f79f05c2f35f918c1616

commit f9537b08ba1537253083f79f05c2f35f918c1616
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Tue Feb 18 19:54:05 2020 -0500

    IDP-1397: Removal of deprecated features
    
    In these cases we're implementing a deprecated interface from another
    API.  To both suppress the deprecation warnings and also to
    warn ourselves if we accidentally use them, mark our impls @Deprecated.
    Add @Override so we'll brute-force know when the third-party API
    removes the deprecated method.
---
 .../java/support/httpclient/ContextHandlingHttpClient.java | 12 ++++++++----
 .../support/httpclient/FileCachingHttpClientBuilder.java   | 14 ++++++++++----
 .../support/httpclient/ContextHandlingHttpClientTest.java  | 10 ++++++----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java
index 1005e36..dd980da 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java
@@ -31,9 +31,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpRequestWrapper;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpContext;
 import org.slf4j.Logger;
@@ -100,21 +98,27 @@ class ContextHandlingHttpClient extends CloseableHttpClient {
     }
 
     /** {@inheritDoc} */
-    public HttpParams getParams() {
+    @Deprecated
+    @Override
+    public org.apache.http.params.HttpParams getParams() {
         return httpClient.getParams();
     }
 
     /** {@inheritDoc} */
-    public ClientConnectionManager getConnectionManager() {
+    @Deprecated
+    @Override
+    public org.apache.http.conn.ClientConnectionManager getConnectionManager() {
         return httpClient.getConnectionManager();
     }
     
     /** {@inheritDoc} */
+    @Override
     public void close() throws IOException {
         httpClient.close();
     }
 
     /** {@inheritDoc} */
+    @Override
     protected CloseableHttpResponse doExecute(final HttpHost target, final HttpRequest request, 
             final HttpContext context) throws IOException, ClientProtocolException {
         
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
index d1e5b29..a75fe1f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
@@ -39,13 +39,11 @@ import org.apache.http.HttpRequest;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.cache.CacheConfig;
 import org.apache.http.impl.client.cache.CachingHttpClientBuilder;
 import org.apache.http.impl.client.cache.FileResourceFactory;
 import org.apache.http.impl.client.cache.ManagedHttpCacheStorage;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -313,20 +311,25 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
         }
 
         /** {@inheritDoc} */
-        @Deprecated public HttpParams getParams() {
+        @Override
+        @Deprecated
+        public org.apache.http.params.HttpParams getParams() {
             ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
             ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
             return httpClient.getParams();
         }
         
         /** {@inheritDoc} */
-        @Deprecated public ClientConnectionManager getConnectionManager() {
+        @Override
+        @Deprecated
+        public org.apache.http.conn.ClientConnectionManager getConnectionManager() {
             ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
             ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
             return httpClient.getConnectionManager();
         }
 
         /** {@inheritDoc} */
+        @Override
         public void close() throws IOException {
             ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
             ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
@@ -334,16 +337,19 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
         }
 
         /** {@inheritDoc} */
+        @Override
         public boolean isInitialized() {
             return initialized;
         }
 
         /** {@inheritDoc} */
+        @Override
         public boolean isDestroyed() {
             return destroyed;
         }
 
         /** {@inheritDoc} */
+        @Override
         public void initialize() throws ComponentInitializationException {
             timer = new Timer(TimerSupport.getTimerName(this), true);
             maintenanceTask = new StorageMaintenanceTask(storage);
diff --git a/src/test/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClientTest.java b/src/test/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClientTest.java
index 4a31021..485e111 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClientTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClientTest.java
@@ -33,10 +33,8 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -1867,12 +1865,16 @@ public class ContextHandlingHttpClientTest {
         }
 
         /** {@inheritDoc} */
-        public HttpParams getParams() {
+        @Deprecated
+        @Override
+        public org.apache.http.params.HttpParams getParams() {
             return null;
         }
 
         /** {@inheritDoc} */
-        public ClientConnectionManager getConnectionManager() {
+        @Deprecated
+        @Override
+        public org.apache.http.conn.ClientConnectionManager getConnectionManager() {
             return null;
         }
         

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.