Skip to content

Commit 2b8dc69

Browse files
cowtowncodercowtowncoder
committed
Trying to resolve eclipse warnings; simplified Netty ResponseBodyPart
1 parent b7307e5 commit 2b8dc69

22 files changed

+80
-96
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ public BoundRequestBuilder prepareRequest(Request request) {
506506
*/
507507
public <T> ListenableFuture<T> executeRequest(Request request, AsyncHandler<T> handler) throws IOException {
508508

509-
FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(handler).request(request).build();
509+
FilterContext<T> fc = new FilterContext.FilterContextBuilder<T>().asyncHandler(handler).request(request).build();
510510
fc = preProcessRequest(fc);
511511

512512
return httpProvider.execute(fc.getRequest(), fc.getAsyncHandler());
@@ -520,7 +520,7 @@ public <T> ListenableFuture<T> executeRequest(Request request, AsyncHandler<T> h
520520
* @throws IOException
521521
*/
522522
public ListenableFuture<Response> executeRequest(Request request) throws IOException {
523-
FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(new AsyncCompletionHandlerBase()).request(request).build();
523+
FilterContext<Response> fc = new FilterContext.FilterContextBuilder<Response>().asyncHandler(new AsyncCompletionHandlerBase()).request(request).build();
524524
fc = preProcessRequest(fc);
525525
return httpProvider.execute(fc.getRequest(), fc.getAsyncHandler());
526526
}
@@ -531,7 +531,7 @@ public ListenableFuture<Response> executeRequest(Request request) throws IOExcep
531531
* @param fc {@link FilterContext}
532532
* @return {@link FilterContext}
533533
*/
534-
private FilterContext preProcessRequest(FilterContext fc) throws IOException {
534+
private <T> FilterContext<T> preProcessRequest(FilterContext<T> fc) throws IOException {
535535
for (RequestFilter asyncFilter : config.getRequestFilters()) {
536536
try {
537537
fc = asyncFilter.filter(fc);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.ning.http.client;
1717

1818
import java.io.IOException;
19-
import java.util.Collection;
2019
import java.util.List;
2120

2221
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public interface AsyncHttpProviderConfig<U, V> {
2929
* @param value the value of the property
3030
* @return this instance of AsyncHttpProviderConfig
3131
*/
32-
public AsyncHttpProviderConfig addProperty(U name, V value);
32+
public AsyncHttpProviderConfig<U,V> addProperty(U name, V value);
3333

3434
/**
3535
* Return the value associated with the property's name

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ public SimpleAsyncHttpClient build() {
678678
}
679679

680680
private final static class ResumableBodyConsumerAsyncHandler
681-
extends ResumableAsyncHandler<Response>
681+
extends ResumableAsyncHandler
682682
implements ProgressAsyncHandler<Response> {
683683

684684
private final ProgressAsyncHandler<Response> delegate;

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
*/
3434
public class FilterContext<T> {
3535

36-
private final FilterContextBuilder b;
36+
private final FilterContextBuilder<T> b;
3737

3838
/**
3939
* Create a new {@link FilterContext}
4040
*
4141
* @param b a {@link FilterContextBuilder}
4242
*/
43-
private FilterContext(FilterContextBuilder b) {
43+
private FilterContext(FilterContextBuilder<T> b) {
4444
this.b = b;
4545
}
4646

@@ -108,7 +108,7 @@ public static class FilterContextBuilder<T> {
108108
public FilterContextBuilder() {
109109
}
110110

111-
public FilterContextBuilder(FilterContext clone) {
111+
public FilterContextBuilder(FilterContext<T> clone) {
112112
asyncHandler = clone.getAsyncHandler();
113113
request = clone.getRequest();
114114
responseStatus = clone.getResponseStatus();
@@ -120,7 +120,7 @@ public AsyncHandler<T> getAsyncHandler() {
120120
return asyncHandler;
121121
}
122122

123-
public FilterContextBuilder asyncHandler(AsyncHandler<T> asyncHandler) {
123+
public FilterContextBuilder<T> asyncHandler(AsyncHandler<T> asyncHandler) {
124124
this.asyncHandler = asyncHandler;
125125
return this;
126126
}
@@ -129,33 +129,33 @@ public Request getRequest() {
129129
return request;
130130
}
131131

132-
public FilterContextBuilder request(Request request) {
132+
public FilterContextBuilder<T> request(Request request) {
133133
this.request = request;
134134
return this;
135135
}
136136

137-
public FilterContextBuilder responseStatus(HttpResponseStatus responseStatus) {
137+
public FilterContextBuilder<T> responseStatus(HttpResponseStatus responseStatus) {
138138
this.responseStatus = responseStatus;
139139
return this;
140140
}
141141

142-
public FilterContextBuilder responseHeaders(HttpResponseHeaders headers) {
142+
public FilterContextBuilder<T> responseHeaders(HttpResponseHeaders headers) {
143143
this.headers = headers;
144144
return this;
145145
}
146146

147-
public FilterContextBuilder replayRequest(boolean replayRequest) {
147+
public FilterContextBuilder<T> replayRequest(boolean replayRequest) {
148148
this.replayRequest = replayRequest;
149149
return this;
150150
}
151151

152-
public FilterContextBuilder ioException(IOException ioException) {
152+
public FilterContextBuilder<T> ioException(IOException ioException) {
153153
this.ioException = ioException;
154154
return this;
155155
}
156156

157-
public FilterContext build() {
158-
return new FilterContext(this);
157+
public FilterContext<T> build() {
158+
return new FilterContext<T>(this);
159159
}
160160
}
161161

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ public interface IOExceptionFilter {
2525
* @return {@link FilterContext}. The {@link FilterContext} instance may not the same as the original one.
2626
* @throws FilterException to interrupt the filter processing.
2727
*/
28-
public FilterContext filter(FilterContext ctx) throws FilterException;
28+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException;
2929
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@ public interface RequestFilter {
2626
* @return {@link FilterContext}. The {@link FilterContext} instance may not the same as the original one.
2727
* @throws FilterException to interrupt the filter processing.
2828
*/
29-
public FilterContext filter(FilterContext ctx) throws FilterException;
30-
29+
public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException;
3130
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ private HttpMethodBase createMethod(HttpClient client, Request request) throws I
323323
}
324324
}
325325

326-
if (request.getHeaders().getFirstValue("Expect") != null
327-
&& request.getHeaders().getFirstValue("Expect").equalsIgnoreCase("100-Continue")) {
326+
String expect = request.getHeaders().getFirstValue("Expect");
327+
if (expect != null && expect.equalsIgnoreCase("100-Continue")) {
328328
post.setUseExpectHeader(true);
329329
}
330330
method = post;
@@ -357,10 +357,9 @@ private HttpMethodBase createMethod(HttpClient client, Request request) throws I
357357
}
358358

359359
method.setFollowRedirects(false);
360-
if ((request.getCookies() != null) && !request.getCookies().isEmpty()) {
361-
for (Cookie cookie : request.getCookies()) {
362-
method.setRequestHeader("Cookie", AsyncHttpProviderUtils.encodeCookies(request.getCookies()));
363-
}
360+
Collection<Cookie> cookies = request.getCookies();
361+
if ((cookies != null) && !cookies.isEmpty()) {
362+
method.setRequestHeader("Cookie", AsyncHttpProviderUtils.encodeCookies(request.getCookies()));
364363
}
365364

366365
if (request.getHeaders() != null) {
@@ -373,8 +372,9 @@ private HttpMethodBase createMethod(HttpClient client, Request request) throws I
373372
}
374373
}
375374

376-
if (request.getHeaders().getFirstValue("User-Agent") != null) {
377-
method.setRequestHeader("User-Agent", request.getHeaders().getFirstValue("User-Agent"));
375+
String ua = request.getHeaders().getFirstValue("User-Agent");
376+
if (ua != null) {
377+
method.setRequestHeader("User-Agent", ua);
378378
} else if (config.getUserAgent() != null) {
379379
method.setRequestHeader("User-Agent", config.getUserAgent());
380380
} else {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,8 @@ public GrizzlyAsyncHttpProvider(final AsyncHttpClientConfig clientConfig) {
190190
/**
191191
* {@inheritDoc}
192192
*/
193-
@SuppressWarnings({"unchecked"})
194193
public <T> ListenableFuture<T> execute(final Request request,
195-
final AsyncHandler<T> handler) throws IOException {
194+
final AsyncHandler<T> handler) throws IOException {
196195

197196
final GrizzlyResponseFuture<T> future =
198197
new GrizzlyResponseFuture<T>(this, request, handler);
@@ -1322,8 +1321,6 @@ protected void onHttpHeadersParsed(HttpHeader httpHeader,
13221321

13231322
}
13241323

1325-
1326-
@SuppressWarnings({"unchecked"})
13271324
@Override
13281325
protected boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx) {
13291326

@@ -2211,6 +2208,7 @@ static class ConnectionManager {
22112208

22122209
// -------------------------------------------------------- Constructors
22132210

2211+
@SuppressWarnings("unchecked")
22142212
ConnectionManager(final GrizzlyAsyncHttpProvider provider,
22152213
final TCPNIOTransport transport) {
22162214

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
* @author The Grizzly Team
4343
* @since 1.7.0
4444
*/
45+
@SuppressWarnings("rawtypes")
4546
public class GrizzlyConnectionsPool implements ConnectionsPool<String,Connection> {
4647

4748
private final static Logger LOG = LoggerFactory.getLogger(GrizzlyConnectionsPool.class);
@@ -304,7 +305,6 @@ private static boolean wasModified(final Long l1, final Long l2) {
304305

305306
private class DelayedRunnable implements Runnable {
306307

307-
@SuppressWarnings("unchecked")
308308
@Override
309309
public void run() {
310310
while (isStarted) {
@@ -315,8 +315,9 @@ public void run() {
315315

316316
final TimeoutResolver resolver = delayQueue.resolver;
317317

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

322323
if (timeoutMs == null || timeoutMs == UNSET_TIMEOUT) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.glassfish.grizzly.http.HttpContent;
2222
import org.glassfish.grizzly.utils.BufferInputStream;
2323

24-
import java.io.ByteArrayInputStream;
2524
import java.io.IOException;
2625
import java.io.InputStream;
2726
import java.io.OutputStream;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public class JDKAsyncHttpProviderConfig implements AsyncHttpProviderConfig<Strin
2424

2525
private final ConcurrentHashMap<String, String> properties = new ConcurrentHashMap<String, String>();
2626

27-
public AsyncHttpProviderConfig addProperty(String name, String value) {
27+
@Override
28+
public JDKAsyncHttpProviderConfig addProperty(String name, String value) {
2829
properties.put(name, value);
2930
return this;
3031
}

‎src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@
113113
import java.nio.channels.ClosedChannelException;
114114
import java.nio.channels.FileChannel;
115115
import java.nio.channels.WritableByteChannel;
116+
import java.nio.charset.Charset;
116117
import java.security.GeneralSecurityException;
117118
import java.security.NoSuchAlgorithmException;
118119
import java.util.ArrayList;
119-
import java.util.Collection;
120120
import java.util.Iterator;
121121
import java.util.List;
122122
import java.util.Map.Entry;
@@ -142,7 +142,10 @@ public class NettyAsyncHttpProvider extends SimpleChannelUpstreamHandler impleme
142142
private final static String HTTP = "http";
143143
private static final String WEBSOCKET = "ws";
144144
private static final String WEBSOCKET_SSL = "wss";
145+
145146
private final static Logger log = LoggerFactory.getLogger(NettyAsyncHttpProvider.class);
147+
private final static Charset UTF8 = Charset.forName("UTF-8");
148+
146149
private final ClientBootstrap plainBootstrap;
147150
private final ClientBootstrap secureBootstrap;
148151
private final ClientBootstrap webSocketBootstrap;
@@ -539,7 +542,6 @@ protected final static HttpRequest buildRequest(AsyncHttpClientConfig config, Re
539542
return construct(config, request, new HttpMethod(method), uri, buffer);
540543
}
541544

542-
@SuppressWarnings("deprecation")
543545
private static HttpRequest construct(AsyncHttpClientConfig config,
544546
Request request,
545547
HttpMethod m,
@@ -1451,18 +1453,15 @@ private void finishUpdate(final NettyResponseFuture<?> future, final ChannelHand
14511453
markAsDone(future, ctx);
14521454
}
14531455

1454-
@SuppressWarnings("unchecked")
1455-
private final boolean updateStatusAndInterrupt(AsyncHandler handler, HttpResponseStatus c) throws Exception {
1456+
private final boolean updateStatusAndInterrupt(AsyncHandler<?> handler, HttpResponseStatus c) throws Exception {
14561457
return handler.onStatusReceived(c) != STATE.CONTINUE;
14571458
}
14581459

1459-
@SuppressWarnings("unchecked")
1460-
private final boolean updateHeadersAndInterrupt(AsyncHandler handler, HttpResponseHeaders c) throws Exception {
1460+
private final boolean updateHeadersAndInterrupt(AsyncHandler<?> handler, HttpResponseHeaders c) throws Exception {
14611461
return handler.onHeadersReceived(c) != STATE.CONTINUE;
14621462
}
14631463

1464-
@SuppressWarnings("unchecked")
1465-
private final boolean updateBodyAndInterrupt(final NettyResponseFuture<?> future, AsyncHandler handler, HttpResponseBodyPart c) throws Exception {
1464+
private final boolean updateBodyAndInterrupt(final NettyResponseFuture<?> future, AsyncHandler<?> handler, HttpResponseBodyPart c) throws Exception {
14661465
boolean state = handler.onBodyPartReceived(c) != STATE.CONTINUE;
14671466
if (c.closeUnderlyingConnection()) {
14681467
future.setKeepAlive(false);
@@ -2385,7 +2384,7 @@ public void setContent(ChannelBuffer content) {
23852384

23862385
NettyWebSocket webSocket = NettyWebSocket.class.cast(h.onCompleted());
23872386
webSocket.onMessage(rp.getBodyPartBytes());
2388-
webSocket.onTextMessage(frame.getBinaryData().toString("UTF-8"));
2387+
webSocket.onTextMessage(frame.getBinaryData().toString(UTF8));
23892388

23902389
if (CloseWebSocketFrame.class.isAssignableFrom(frame.getClass())) {
23912390
try {

0 commit comments

Comments
 (0)