Skip to content

Commit 8194daf

Browse files
cowtowncodercowtowncoder
committed
Further warning cleanup, "only" 200 left (mostly trying to resolve generic type tangle)
1 parent 2b8dc69 commit 8194daf

28 files changed

+58
-63
lines changed

‎src/main/java/com/ning/http/client/AsyncHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ private <T> FilterContext<T> preProcessRequest(FilterContext<T> fc) throws IOExc
555555
builder.setHeader("Range", "bytes=" + request.getRangeOffset() + "-");
556556
request = builder.build();
557557
}
558-
fc = new FilterContext.FilterContextBuilder(fc).request(request).build();
558+
fc = new FilterContext.FilterContextBuilder<T>(fc).request(request).build();
559559
return fc;
560560
}
561561

‎src/main/java/com/ning/http/client/ListenableFuture.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public interface ListenableFuture<V> extends Future<V> {
4646
*
4747
* @param callable
4848
*/
49-
void done(Callable callable);
49+
void done(Callable<?> callable);
5050

5151
/**
5252
* Abort the current processing, and propagate the {@link Throwable} to the {@link AsyncHandler} or {@link Future}

‎src/main/java/com/ning/http/client/Realm.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,6 @@ public int hashCode() {
257257
* A builder for {@link Realm}
258258
*/
259259
public static class RealmBuilder {
260-
261-
private static final Logger logger = LoggerFactory.getLogger(RealmBuilder.class);
262-
263260
//
264261
// Portions of code (newCnonce, newResponse) are highly inspired be Jetty 6 BasicAuthentication.java class.
265262
// This code is already Apache licenced.

‎src/main/java/com/ning/http/client/extra/ResumableRandomAccessFileListener.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
*/
2626
public class ResumableRandomAccessFileListener implements ResumableListener {
2727
private final RandomAccessFile file;
28-
private final static Logger logger = LoggerFactory.getLogger(ThrottleRequestFilter.class);
2928

3029
public ResumableRandomAccessFileListener(RandomAccessFile file) {
3130
this.file = file;

‎src/main/java/com/ning/http/client/extra/ThrottleRequestFilter.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232
public class ThrottleRequestFilter implements RequestFilter {
3333
private final static Logger logger = LoggerFactory.getLogger(ThrottleRequestFilter.class);
34+
@SuppressWarnings("unused")
3435
private final int maxConnections;
3536
private final Semaphore available;
3637
private final int maxWait;
@@ -51,7 +52,7 @@ public ThrottleRequestFilter(int maxConnections, int maxWait) {
5152
* {@inheritDoc}
5253
*/
5354
/* @Override */
54-
public FilterContext filter(FilterContext ctx) throws FilterException {
55+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException {
5556

5657
try {
5758
if (logger.isDebugEnabled()) {
@@ -68,10 +69,10 @@ public FilterContext filter(FilterContext ctx) throws FilterException {
6869
String.format("Interrupted Request %s with AsyncHandler %s", ctx.getRequest(), ctx.getAsyncHandler()));
6970
}
7071

71-
return new FilterContext.FilterContextBuilder(ctx).asyncHandler(new AsyncHandlerWrapper(ctx.getAsyncHandler())).build();
72+
return new FilterContext.FilterContextBuilder<T>(ctx).asyncHandler(new AsyncHandlerWrapper<T>(ctx.getAsyncHandler())).build();
7273
}
7374

74-
private class AsyncHandlerWrapper<T> implements AsyncHandler {
75+
private class AsyncHandlerWrapper<T> implements AsyncHandler<T> {
7576

7677
private final AsyncHandler<T> asyncHandler;
7778

‎src/main/java/com/ning/http/client/filter/FilterException.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* An exception that can be thrown by an {@link com.ning.http.client.AsyncHandler} to interrupt invocation of
1717
* the {@link RequestFilter} and {@link ResponseFilter}. It also interrupt the request and response processing.
1818
*/
19+
@SuppressWarnings("serial")
1920
public class FilterException extends Exception {
2021

2122
/**

‎src/main/java/com/ning/http/client/filter/ResponseFilter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,5 @@ public interface ResponseFilter {
2929
* @return {@link FilterContext}. The {@link FilterContext} instance may not the same as the original one.
3030
* @throws FilterException to interrupt the filter processing.
3131
*/
32-
public FilterContext filter(FilterContext ctx) throws FilterException;
33-
32+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException;
3433
}

‎src/main/java/com/ning/http/client/providers/apache/ApacheAsyncHttpProvider.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.apache.commons.httpclient.Credentials;
4848
import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
4949
import org.apache.commons.httpclient.Header;
50-
import org.apache.commons.httpclient.HostConfiguration;
5150
import org.apache.commons.httpclient.HttpClient;
5251
import org.apache.commons.httpclient.HttpMethodBase;
5352
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
@@ -205,7 +204,7 @@ public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler)
205204
ApacheResponseFuture<T> f = new ApacheResponseFuture<T>(handler, requestTimeout, request, method);
206205
f.touch();
207206

208-
f.setInnerFuture(config.executorService().submit(new ApacheClientRunnable(request, handler, method, f, httpClient)));
207+
f.setInnerFuture(config.executorService().submit(new ApacheClientRunnable<T>(request, handler, method, f, httpClient)));
209208
maxConnections.incrementAndGet();
210209
return f;
211210
}
@@ -456,7 +455,7 @@ public T call() {
456455
int delay = requestTimeout(config, future.getRequest().getPerRequestConfig());
457456
if (delay != -1) {
458457
ReaperFuture reaperFuture = new ReaperFuture(future);
459-
Future scheduledFuture = config.reaper().scheduleAtFixedRate(reaperFuture, delay, 500, TimeUnit.MILLISECONDS);
458+
Future<?> scheduledFuture = config.reaper().scheduleAtFixedRate(reaperFuture, delay, 500, TimeUnit.MILLISECONDS);
460459
reaperFuture.setScheduledFuture(scheduledFuture);
461460
future.setReaperFuture(reaperFuture);
462461
}
@@ -475,7 +474,7 @@ public T call() {
475474
}
476475

477476
ApacheResponseStatus status = new ApacheResponseStatus(uri, method, ApacheAsyncHttpProvider.this);
478-
FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(asyncHandler).request(request).responseStatus(status).build();
477+
FilterContext<T> fc = new FilterContext.FilterContextBuilder<T>().asyncHandler(asyncHandler).request(request).responseStatus(status).build();
479478
for (ResponseFilter asyncFilter : config.getResponseFilters()) {
480479
fc = asyncFilter.filter(fc);
481480
if (fc == null) {
@@ -594,7 +593,7 @@ public T call() {
594593
} catch (Throwable t) {
595594

596595
if (IOException.class.isAssignableFrom(t.getClass()) && config.getIOExceptionFilters().size() > 0) {
597-
FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(asyncHandler)
596+
FilterContext<T> fc = new FilterContext.FilterContextBuilder<T>().asyncHandler(asyncHandler)
598597
.request(future.getRequest()).ioException(IOException.class.cast(t)).build();
599598

600599
try {
@@ -666,7 +665,7 @@ private Throwable filterException(Throwable t) {
666665
return t;
667666
}
668667

669-
private FilterContext handleIoException(FilterContext fc) throws FilterException {
668+
private FilterContext<T> handleIoException(FilterContext<T> fc) throws FilterException {
670669
for (IOExceptionFilter asyncFilter : config.getIOExceptionFilters()) {
671670
fc = asyncFilter.filter(fc);
672671
if (fc == null) {

‎src/main/java/com/ning/http/client/providers/grizzly/GrizzlyConnectionsPool.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,7 @@ public void run() {
315315

316316
final TimeoutResolver resolver = delayQueue.resolver;
317317

318-
for (@SuppressWarnings("rawtypes")
319-
Iterator<Connection> it = delayQueue.queue.iterator(); it.hasNext(); ) {
318+
for (Iterator<Connection> it = delayQueue.queue.iterator(); it.hasNext(); ) {
320319
final Connection<?> element = (Connection<?>) it.next();
321320
final Long timeoutMs = resolver.getTimeoutMs(element);
322321

‎src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler)
121121
return execute(request, handler, null);
122122
}
123123

124-
public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler, ListenableFuture<?> future) throws IOException {
124+
public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler, ListenableFuture<T> future) throws IOException {
125125
if (isClose.get()) {
126126
throw new IOException("Closed");
127127
}
@@ -133,10 +133,9 @@ public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler,
133133
ProxyServer proxyServer = request.getProxyServer() != null ? request.getProxyServer() : config.getProxyServer();
134134
Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
135135
boolean avoidProxy = ProxyUtils.avoidProxy(proxyServer, request);
136-
Proxy proxy = null;
137136
if (!avoidProxy && (proxyServer != null || realm != null)) {
138137
try {
139-
proxy = configureProxyAndAuth(proxyServer, realm);
138+
/*Proxy proxy =*/ configureProxyAndAuth(proxyServer, realm);
140139
} catch (AuthenticationException e) {
141140
throw new IOException(e.getMessage());
142141
}
@@ -148,15 +147,15 @@ public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler,
148147
int requestTimeout = (conf != null && conf.getRequestTimeoutInMs() != 0) ?
149148
conf.getRequestTimeoutInMs() : config.getRequestTimeoutInMs();
150149

151-
JDKDelegateFuture delegate = null;
150+
JDKDelegateFuture<T> delegate = null;
152151
if (future != null) {
153-
delegate = new JDKDelegateFuture(handler, requestTimeout, future, urlConnection);
152+
delegate = new JDKDelegateFuture<T>(handler, requestTimeout, future, urlConnection);
154153
}
155154

156-
JDKFuture f = delegate == null ? new JDKFuture<T>(handler, requestTimeout, urlConnection) : delegate;
155+
JDKFuture<T> f = (delegate == null) ? new JDKFuture<T>(handler, requestTimeout, urlConnection) : delegate;
157156
f.touch();
158157

159-
f.setInnerFuture(config.executorService().submit(new AsyncHttpUrlConnection(urlConnection, request, handler, f)));
158+
f.setInnerFuture(config.executorService().submit(new AsyncHttpUrlConnection<T>(urlConnection, request, handler, f)));
160159
maxConnections.incrementAndGet();
161160

162161
return f;
@@ -252,7 +251,7 @@ public T call() throws Exception {
252251
logger.debug("\n\nRequest {}\n\nResponse {}\n", request, statusCode);
253252

254253
ResponseStatus status = new ResponseStatus(uri, urlConnection, JDKAsyncHttpProvider.this);
255-
FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(asyncHandler).request(request).responseStatus(status).build();
254+
FilterContext<T> fc = new FilterContext.FilterContextBuilder<T>().asyncHandler(asyncHandler).request(request).responseStatus(status).build();
256255
for (ResponseFilter asyncFilter : config.getResponseFilters()) {
257256
fc = asyncFilter.filter(fc);
258257
if (fc == null) {

‎src/main/java/com/ning/http/client/providers/jdk/JDKDelegateFuture.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ public class JDKDelegateFuture<V> extends JDKFuture<V> {
2525

2626
private final ListenableFuture<V> delegateFuture;
2727

28-
public JDKDelegateFuture(AsyncHandler<V> asyncHandler, int responseTimeoutInMs, ListenableFuture<V> delegateFuture, HttpURLConnection urlConnection) {
28+
public JDKDelegateFuture(AsyncHandler<V> asyncHandler, int responseTimeoutInMs,
29+
ListenableFuture<V> delegateFuture, HttpURLConnection urlConnection) {
2930
super(asyncHandler, responseTimeoutInMs, urlConnection);
3031
this.delegateFuture = delegateFuture;
3132
}
3233

33-
public void done(Callable callable) {
34+
public void done(Callable<?> callable) {
3435
delegateFuture.done(callable);
3536
super.done(callable);
3637
}

‎src/main/java/com/ning/http/client/providers/jdk/JDKFuture.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected void setInnerFuture(Future<V> innerFuture) {
5858
this.innerFuture = innerFuture;
5959
}
6060

61-
public void done(Callable callable) {
61+
public void done(Callable<?> callable) {
6262
isDone.set(true);
6363
super.done();
6464
}

‎src/main/java/com/ning/http/client/websocket/WebSocketUpgradeHandler.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ public class WebSocketUpgradeHandler implements UpgradeHandler<WebSocket>, Async
2828

2929
private WebSocket webSocket;
3030
private final ConcurrentLinkedQueue<WebSocketListener> l;
31+
@SuppressWarnings("unused")
3132
private final String protocol;
33+
@SuppressWarnings("unused")
3234
private final long maxByteSize;
35+
@SuppressWarnings("unused")
3336
private final long maxTextSize;
3437
private final AtomicBoolean ok = new AtomicBoolean(false);
3538

‎src/main/java/com/ning/http/multipart/FileUploadStalledException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
/**
1818
* @author Gail Hernandez
1919
*/
20+
@SuppressWarnings("serial")
2021
public class FileUploadStalledException extends IOException {
21-
2222
}

‎src/test/java/com/ning/http/client/async/AsyncProvidersBasicTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@ public Response onCompleted(Response response) throws Exception {
514514
public void asyncDoPostBodyIsoTest() throws Throwable {
515515

516516
AsyncHttpClient c = getAsyncHttpClient(null);
517-
final CountDownLatch l = new CountDownLatch(1);
518517
Response r = c.preparePost(getTargetUrl()).addHeader("X-ISO", "true").setBody("\u017D\u017D\u017D\u017D\u017D\u017D").execute().get();
519518
assertEquals(r.getResponseBody().getBytes("ISO-8859-1"),"\u017D\u017D\u017D\u017D\u017D\u017D".getBytes("ISO-8859-1"));
520519
c.close();

‎src/test/java/com/ning/http/client/async/AsyncStreamHandlerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ public String onCompleted() throws Exception {
508508

509509
@Test(groups = {"standalone", "default_provider"})
510510
public void closeConnectionTest() throws Throwable {
511-
final CountDownLatch l = new CountDownLatch(1);
512511
AsyncHttpClient c = getAsyncHttpClient(null);
513512

514513
Response r = c.prepareGet(getTargetUrl()).execute(new AsyncHandler<Response>() {

‎src/test/java/com/ning/http/client/async/ByteBufferCapacityTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public AbstractHandler configureHandler() throws Exception {
7979
@Test(groups = {"standalone", "default_provider"})
8080
public void basicByteBufferTest() throws Throwable {
8181
AsyncHttpClient c = getAsyncHttpClient(null);
82-
final AtomicBoolean completed = new AtomicBoolean(false);
8382

8483
byte[] bytes = "RatherLargeFileRatherLargeFileRatherLargeFileRatherLargeFile".getBytes("UTF-16");
8584
long repeats = (1024 * 100 * 10 / bytes.length) + 1;

‎src/test/java/com/ning/http/client/async/FilterTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ public void maxConnectionsText() throws Throwable {
107107
AsyncHttpClient c = getAsyncHttpClient(b.build());
108108

109109
try {
110-
Response response = c.preparePost(getTargetUrl())
111-
.execute().get();
110+
/*Response response =*/ c.preparePost(getTargetUrl()).execute().get();
112111
fail("Should have timed out");
113112
} catch (IOException ex) {
114113
assertNotNull(ex);
@@ -126,7 +125,8 @@ public void basicResponseFilterTest() throws Throwable {
126125
AsyncHttpClientConfig.Builder b = new AsyncHttpClientConfig.Builder();
127126
b.addResponseFilter(new ResponseFilter() {
128127

129-
public FilterContext filter(FilterContext ctx) throws FilterException {
128+
//@Override
129+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException {
130130
return ctx;
131131
}
132132

@@ -152,11 +152,11 @@ public void replayResponseFilterTest() throws Throwable {
152152

153153
b.addResponseFilter(new ResponseFilter() {
154154

155-
public FilterContext filter(FilterContext ctx) throws FilterException {
155+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException {
156156

157157
if (replay.getAndSet(false)) {
158158
Request request = new RequestBuilder(ctx.getRequest()).addHeader("X-Replay", "true").build();
159-
return new FilterContext.FilterContextBuilder().asyncHandler(ctx.getAsyncHandler()).request(request).replayRequest(true).build();
159+
return new FilterContext.FilterContextBuilder<T>().asyncHandler(ctx.getAsyncHandler()).request(request).replayRequest(true).build();
160160
}
161161
return ctx;
162162
}
@@ -184,11 +184,11 @@ public void replayStatusCodeResponseFilterTest() throws Throwable {
184184

185185
b.addResponseFilter(new ResponseFilter() {
186186

187-
public FilterContext filter(FilterContext ctx) throws FilterException {
187+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException {
188188

189189
if (ctx.getResponseStatus() != null && ctx.getResponseStatus().getStatusCode() == 200 && replay.getAndSet(false)) {
190190
Request request = new RequestBuilder(ctx.getRequest()).addHeader("X-Replay", "true").build();
191-
return new FilterContext.FilterContextBuilder().asyncHandler(ctx.getAsyncHandler()).request(request).replayRequest(true).build();
191+
return new FilterContext.FilterContextBuilder<T>().asyncHandler(ctx.getAsyncHandler()).request(request).replayRequest(true).build();
192192
}
193193
return ctx;
194194
}
@@ -216,14 +216,14 @@ public void replayHeaderResponseFilterTest() throws Throwable {
216216

217217
b.addResponseFilter(new ResponseFilter() {
218218

219-
public FilterContext filter(FilterContext ctx) throws FilterException {
219+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException {
220220

221221
if (ctx.getResponseHeaders() != null
222222
&& ctx.getResponseHeaders().getHeaders().getFirstValue("Ping").equals("Pong")
223223
&& replay.getAndSet(false)) {
224224

225225
Request request = new RequestBuilder(ctx.getRequest()).addHeader("Ping", "Pong").build();
226-
return new FilterContext.FilterContextBuilder()
226+
return new FilterContext.FilterContextBuilder<T>()
227227
.asyncHandler(ctx.getAsyncHandler())
228228
.request(request)
229229
.replayRequest(true)

‎src/test/java/com/ning/http/client/async/MaxConnectionsInThreads.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ public String getTargetUrl() {
174174
return s;
175175
}
176176

177+
@SuppressWarnings("serial")
177178
public static class MockTimeoutHttpServlet extends HttpServlet {
178179
private static final String contentType = "text/plain";
179180
public static long DEFAULT_TIMEOUT = 2000;

‎src/test/java/com/ning/http/client/async/MaxTotalConnectionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void testMaxTotalConnectionsCorrectExceptionHandling() {
109109
.build()
110110
);
111111

112-
List<Future> futures = new ArrayList<Future>();
112+
List<Future<Response>> futures = new ArrayList<Future<Response>>();
113113
boolean caughtError = false;
114114
for (int i = 0; i < urls.length; i++) {
115115
try {
@@ -126,9 +126,9 @@ public void testMaxTotalConnectionsCorrectExceptionHandling() {
126126
Assert.assertTrue(caughtError);
127127

128128
// get results of executed requests
129-
for (Future future : futures) {
129+
for (Future<Response> future : futures) {
130130
try {
131-
Object res = future.get();
131+
/*Response res =*/ future.get();
132132
} catch (InterruptedException e) {
133133
log.error("Error!", e);
134134
} catch (ExecutionException e) {

‎src/test/java/com/ning/http/client/async/PostRedirectGetTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private void doTestNegative(final int status, boolean strict) throws Exception {
8080
setStrict302Handling(strict).
8181
addResponseFilter(new ResponseFilter() {
8282
@Override
83-
public FilterContext filter(FilterContext ctx) throws FilterException {
83+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException {
8484
// pass on the x-expect-get and remove the x-redirect
8585
// headers if found in the response
8686
ctx.getResponseHeaders().getHeaders().get("x-expect-post");
@@ -118,7 +118,7 @@ private void doTestPositive(final int status) throws Exception {
118118
AsyncHttpClient p = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().setFollowRedirects(true).
119119
addResponseFilter(new ResponseFilter() {
120120
@Override
121-
public FilterContext filter(FilterContext ctx) throws FilterException {
121+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException {
122122
// pass on the x-expect-get and remove the x-redirect
123123
// headers if found in the response
124124
ctx.getResponseHeaders().getHeaders().get("x-expect-get");

0 commit comments

Comments
 (0)