hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1510883 - in /httpcomponents/httpasyncclient/trunk: ./ httpasyncclient-cache/ httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/ httpasyncclient-osgi/ httpasyncclient/ httpasyncclient/src/main/java-deprecated/ httpasync...
Date Tue, 06 Aug 2013 08:46:24 GMT
Author: olegk
Date: Tue Aug  6 08:46:23 2013
New Revision: 1510883

URL: http://svn.apache.org/r1510883
Log:
Moved deprecated classes to a separate src folder

Added:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultResultCallback.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultResultCallback.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/ParamConfig.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/ParamConfig.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/ResultCallback.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/ResultCallback.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPool.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPoolFactory.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPoolFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpPoolEntry.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnection.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnectionManager.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionManager.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ManagedClientAsyncConnection.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedClientAsyncConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/
      - copied from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java
      - copied unchanged from r1510879, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java
Removed:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultResultCallback.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/ParamConfig.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/ResultCallback.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPoolFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionManager.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedClientAsyncConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java
Modified:
    httpcomponents/httpasyncclient/trunk/   (props changed)
    httpcomponents/httpasyncclient/trunk/httpasyncclient/   (props changed)
    httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/   (props changed)
    httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/   (props changed)
    httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java

Propchange: httpcomponents/httpasyncclient/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug  6 08:46:23 2013
@@ -3,3 +3,7 @@ target
 .classpath
 .project
 bin
+
+*.iml
+
+.idea

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug  6 08:46:23 2013
@@ -5,3 +5,5 @@
 maven-eclipse.xml
 target
 .pmd
+
+*.iml

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug  6 08:46:23 2013
@@ -5,3 +5,5 @@ maven-eclipse.xml
 .classpath
 .project
 .pmd
+
+*.iml

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java?rev=1510883&r1=1510882&r2=1510883&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
(original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
Tue Aug  6 08:46:23 2013
@@ -59,27 +59,22 @@ import org.apache.http.client.cache.Reso
 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.client.utils.DateUtils;
 import org.apache.http.concurrent.BasicFuture;
 import org.apache.http.concurrent.FutureCallback;
 import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.cookie.DateParseException;
-import org.apache.http.impl.cookie.DateUtils;
-import org.apache.http.impl.nio.client.DefaultHttpAsyncClient;
+import org.apache.http.impl.nio.client.HttpAsyncClients;
 import org.apache.http.message.BasicHttpResponse;
 import org.apache.http.nio.client.HttpAsyncClient;
-import org.apache.http.nio.conn.ClientAsyncConnectionManager;
 import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
 import org.apache.http.nio.reactor.IOReactorException;
-import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
 import org.apache.http.util.EntityUtils;
 import org.apache.http.util.VersionInfo;
 
-@SuppressWarnings("deprecation")
 @ThreadSafe // So long as the responseCache implementation is threadsafe
 public class CachingHttpAsyncClient implements HttpAsyncClient {
 
@@ -137,13 +132,13 @@ public class CachingHttpAsyncClient impl
     }
 
     public CachingHttpAsyncClient() throws IOReactorException {
-        this(new DefaultHttpAsyncClient(),
+        this(HttpAsyncClients.createDefault(),
                 new BasicHttpCache(),
                 CacheConfig.DEFAULT);
     }
 
     public CachingHttpAsyncClient(final CacheConfig config) throws IOReactorException {
-        this(new DefaultHttpAsyncClient(),
+        this(HttpAsyncClients.createDefault(),
                 new BasicHttpCache(config),
                 config);
     }
@@ -279,15 +274,6 @@ public class CachingHttpAsyncClient impl
         return execute(httpHost, request, context, callback);
     }
 
-    public ClientAsyncConnectionManager getConnectionManager() {
-        return this.backend.getConnectionManager();
-    }
-
-    @Deprecated
-    public HttpParams getParams() {
-        return this.backend.getParams();
-    }
-
     public Future<HttpResponse> execute(
             final HttpHost target,
             final HttpRequest originalRequest,
@@ -676,17 +662,10 @@ public class CachingHttpAsyncClient impl
         final Header entryDateHeader = cacheEntry.getFirstHeader(HTTP.DATE_HEADER);
         final Header responseDateHeader = backendResponse.getFirstHeader(HTTP.DATE_HEADER);
         if (entryDateHeader != null && responseDateHeader != null) {
-            try {
-                final Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
-                final Date respDate = DateUtils.parseDate(responseDateHeader.getValue());
-                if (respDate.before(entryDate)) {
-                    return true;
-                }
-            } catch (final DateParseException e) {
-                // either backend response or cached entry did not have a valid
-                // Date header, so we can't tell if they are out of order
-                // according to the origin clock; thus we can skip the
-                // unconditional retry recommended in 13.2.6 of RFC 2616.
+            final Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
+            final Date respDate = DateUtils.parseDate(responseDateHeader.getValue());
+            if (respDate != null && respDate.before(entryDate)) {
+                return true;
             }
         }
         return false;
@@ -823,36 +802,36 @@ public class CachingHttpAsyncClient impl
             }
 
             public void completed(final HttpResponse httpResponse) {
-                   final Date responseDate = getCurrentDate();
+                final Date responseDate = getCurrentDate();
 
-                    if (revalidationResponseIsTooOld(httpResponse, cacheEntry)) {
-                        final HttpRequest unconditional = CachingHttpAsyncClient.this.conditionalRequestBuilder.buildUnconditionalRequest(request,
cacheEntry);
-                        final Date innerRequestDate = getCurrentDate();
-                        CachingHttpAsyncClient.this.backend.execute(target, unconditional,
context, new FutureCallback<HttpResponse>() {
-
-                            public void cancelled() {
-                                future.cancelled();
-                            }
-
-                            public void completed(final HttpResponse innerHttpResponse) {
-                                final Date innerResponseDate = getCurrentDate();
-                                revalidateCacheEntryCompleted(target, request,
-                                        context, cacheEntry, future,
-                                        conditionalRequest, innerRequestDate,
-                                        innerHttpResponse, innerResponseDate);
-                            }
-
-                            public void failed(final Exception ex) {
-                                future.failed(ex);
-                            }
+                if (revalidationResponseIsTooOld(httpResponse, cacheEntry)) {
+                    final HttpRequest unconditional = CachingHttpAsyncClient.this.conditionalRequestBuilder.buildUnconditionalRequest(request,
cacheEntry);
+                    final Date innerRequestDate = getCurrentDate();
+                    CachingHttpAsyncClient.this.backend.execute(target, unconditional, context,
new FutureCallback<HttpResponse>() {
 
-                        });
-                        return;
-                    }
-                    revalidateCacheEntryCompleted(target, request,
-                            context, cacheEntry, future,
-                            conditionalRequest, requestDate,
-                            httpResponse, responseDate);
+                        public void cancelled() {
+                            future.cancelled();
+                        }
+
+                        public void completed(final HttpResponse innerHttpResponse) {
+                            final Date innerResponseDate = getCurrentDate();
+                            revalidateCacheEntryCompleted(target, request,
+                                    context, cacheEntry, future,
+                                    conditionalRequest, innerRequestDate,
+                                    innerHttpResponse, innerResponseDate);
+                        }
+
+                        public void failed(final Exception ex) {
+                            future.failed(ex);
+                        }
+
+                    });
+                    return;
+                }
+                revalidateCacheEntryCompleted(target, request,
+                        context, cacheEntry, future,
+                        conditionalRequest, requestDate,
+                        httpResponse, responseDate);
             }
 
             public void failed(final Exception ex) {
@@ -990,26 +969,9 @@ public class CachingHttpAsyncClient impl
         if (responseDateHeader == null) {
             return false;
         }
-        try {
-            final Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
-            final Date responseDate = DateUtils.parseDate(responseDateHeader.getValue());
-            return responseDate.before(entryDate);
-        } catch (final DateParseException e) {
-            //
-        }
-        return false;
-    }
-
-    public IOReactorStatus getStatus() {
-        return this.backend.getStatus();
-    }
-
-    public void shutdown() throws InterruptedException {
-        this.backend.shutdown();
-    }
-
-    public void start() {
-        this.backend.start();
+        final Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
+        final Date responseDate = DateUtils.parseDate(responseDateHeader.getValue());
+        return responseDate != null && responseDate.before(entryDate);
     }
 
 }

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug  6 08:46:23 2013
@@ -3,3 +3,5 @@ target
 .classpath
 .project
 .pmd
+
+*.iml

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml?rev=1510883&r1=1510882&r2=1510883&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml Tue Aug  6 08:46:23 2013
@@ -100,7 +100,23 @@
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+          <id>add-source</id>
+          <phase>generate-sources</phase>
+          <goals>
+            <goal>add-source</goal>
+          </goals>
+          <configuration>
+            <sources>
+              <source>src/main/java-deprecated</source>
+            </sources>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java?rev=1510883&r1=1510882&r2=1510883&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java
(original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java
Tue Aug  6 08:46:23 2013
@@ -42,18 +42,15 @@ import org.apache.http.concurrent.BasicF
 import org.apache.http.concurrent.FutureCallback;
 import org.apache.http.config.Lookup;
 import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.nio.conn.ClientAsyncConnectionManager;
 import org.apache.http.nio.conn.NHttpClientConnectionManager;
 import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Asserts;
 
-@SuppressWarnings("deprecation")
 class InternalHttpAsyncClient extends CloseableHttpAsyncClient {
 
     private final Log log = LogFactory.getLog(getClass());
@@ -193,14 +190,4 @@ class InternalHttpAsyncClient extends Cl
         return future;
     }
 
-    @Deprecated
-    public ClientAsyncConnectionManager getConnectionManager() {
-        return null;
-    }
-
-    @Deprecated
-    public HttpParams getParams() {
-        return null;
-    }
-
 }

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java?rev=1510883&r1=1510882&r2=1510883&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java
(original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java
Tue Aug  6 08:46:23 2013
@@ -40,13 +40,11 @@ import org.apache.http.concurrent.Future
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy;
-import org.apache.http.nio.conn.ClientAsyncConnectionManager;
 import org.apache.http.nio.conn.NHttpClientConnectionManager;
 import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpProcessor;
@@ -57,7 +55,6 @@ import org.apache.http.protocol.RequestU
 import org.apache.http.util.Asserts;
 import org.apache.http.util.VersionInfo;
 
-@SuppressWarnings("deprecation")
 class MinimalHttpAsyncClient extends CloseableHttpAsyncClient {
 
     private final Log log = LogFactory.getLog(getClass());
@@ -168,14 +165,4 @@ class MinimalHttpAsyncClient extends Clo
         return future;
     }
 
-    @Deprecated
-    public ClientAsyncConnectionManager getConnectionManager() {
-        return null;
-    }
-
-    @Deprecated
-    public HttpParams getParams() {
-        return null;
-    }
-
 }

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java?rev=1510883&r1=1510882&r2=1510883&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java
(original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java
Tue Aug  6 08:46:23 2013
@@ -33,31 +33,12 @@ import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.nio.conn.ClientAsyncConnectionManager;
 import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
-import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 
-@SuppressWarnings("deprecation")
 public interface HttpAsyncClient {
 
-    @Deprecated
-    void start();
-
-    @Deprecated
-    void shutdown() throws InterruptedException;
-
-    @Deprecated
-    IOReactorStatus getStatus();
-
-    @Deprecated
-    ClientAsyncConnectionManager getConnectionManager();
-
-    @Deprecated
-    HttpParams getParams();
-
     <T> Future<T> execute(
             HttpAsyncRequestProducer requestProducer,
             HttpAsyncResponseConsumer<T> responseConsumer,

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java?rev=1510883&r1=1510882&r2=1510883&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java
(original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java
Tue Aug  6 08:46:23 2013
@@ -29,7 +29,6 @@ package org.apache.http.nio.client.util;
 import java.io.IOException;
 
 import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
-import org.apache.http.nio.client.HttpAsyncClient;
 
 /**
  * Static helpers for dealing with {@link HttpAsyncClient}.
@@ -68,13 +67,4 @@ public class HttpAsyncClientUtils {
         }
     }
 
-    @Deprecated
-    public static void closeQuietly(final HttpAsyncClient httpAsyncClient) {
-        if (httpAsyncClient != null) {
-            try {
-                httpAsyncClient.shutdown();
-            } catch (final InterruptedException e) {
-            }
-        }
-    }
 }



Mime
View raw message