honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Label method as @SafeVarargs

This commit is contained in:
Nik Everett 2016-04-14 07:47:13 -04:00
parent eecec97274
commit 348ad7a42e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/test/java/org/elasticsearch/http/netty/NettyHttpClient.java
View File

@ -28,7 +28,6 @@ import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.Channels; import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.MessageEvent;
@ -55,7 +54,7 @@ import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.HOST;
import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1; import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1;
/** /**
* Tiny helper * Tiny helper to send http requests over netty.
*/ */
public class NettyHttpClient implements Closeable { public class NettyHttpClient implements Closeable {
@ -92,7 +91,8 @@ public class NettyHttpClient implements Closeable {
return sendRequests(remoteAddress, requests); return sendRequests(remoteAddress, requests);
} }
public Collection<HttpResponse> post(SocketAddress remoteAddress, Tuple<String, CharSequence>... urisAndBodies) @SafeVarargs // Safe not because it doesn't do anything with the type parameters but because it won't leak them into other methods.
public final Collection<HttpResponse> post(SocketAddress remoteAddress, Tuple<String, CharSequence>... urisAndBodies)
throws InterruptedException { throws InterruptedException {
Collection<HttpRequest> requests = new ArrayList<>(urisAndBodies.length); Collection<HttpRequest> requests = new ArrayList<>(urisAndBodies.length);
for (Tuple<String, CharSequence> uriAndBody : urisAndBodies) { for (Tuple<String, CharSequence> uriAndBody : urisAndBodies) {

1
core/src/test/java/org/elasticsearch/http/netty/NettyHttpRequestSizeLimitIT.java
View File

@ -80,7 +80,6 @@ public class NettyHttpRequestSizeLimitIT extends ESIntegTestCase {
().boundAddresses()); ().boundAddresses());
try (NettyHttpClient nettyHttpClient = new NettyHttpClient()) { try (NettyHttpClient nettyHttpClient = new NettyHttpClient()) {
@SuppressWarnings("unchecked")
Collection<HttpResponse> singleResponse = nettyHttpClient.post(inetSocketTransportAddress.address(), requests[0]); Collection<HttpResponse> singleResponse = nettyHttpClient.post(inetSocketTransportAddress.address(), requests[0]);
assertThat(singleResponse, hasSize(1)); assertThat(singleResponse, hasSize(1));
assertAtLeastOnceExpectedStatus(singleResponse, HttpResponseStatus.OK); assertAtLeastOnceExpectedStatus(singleResponse, HttpResponseStatus.OK);