diff options
author | Olli Virtanen <olli.virtanen@oath.com> | 2019-05-09 10:49:14 +0200 |
---|---|---|
committer | Olli Virtanen <olli.virtanen@oath.com> | 2019-05-10 11:30:01 +0200 |
commit | 6d8b6c68124440f65ff277db8507ec4ec3c1690b (patch) | |
tree | 92b28f45d21334c77d05e0ef2358f8e9c7670759 /vespaclient-container-plugin | |
parent | 1e98247ac92f391bf8af18627354f2374255f32b (diff) |
Eradicate warnings
Diffstat (limited to 'vespaclient-container-plugin')
8 files changed, 7 insertions, 14 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java index 0f4adf0179f..4ca43f5fde2 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java @@ -26,7 +26,6 @@ import com.yahoo.metrics.simple.MetricReceiver; import com.yahoo.vdslib.VisitorOrdering; import com.yahoo.vespaclient.ClusterDef; import com.yahoo.vespaxmlparser.FeedOperation; -import com.yahoo.vespaxmlparser.VespaXMLFeedReader; import com.yahoo.yolean.concurrent.ConcurrentResourcePool; import com.yahoo.yolean.concurrent.ResourceFactory; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -41,7 +40,7 @@ import java.util.Set; /** * Sends operations to messagebus via document api. * - * @author dybis + * @author dybis */ public class OperationHandlerImpl implements OperationHandler { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java index 698c37244a1..d2fd8d92495 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java @@ -35,7 +35,6 @@ import com.yahoo.vespaclient.ClusterDef; import com.yahoo.vespaclient.ClusterList; import com.yahoo.vespaxmlparser.DocumentFeedOperation; import com.yahoo.vespaxmlparser.FeedOperation; -import com.yahoo.vespaxmlparser.VespaXMLFeedReader; import com.yahoo.yolean.Exceptions; import java.io.IOException; @@ -107,7 +106,7 @@ public class RestApi extends LoggingRequestHandler { this.operationHandler = operationHandler; this.threadsAvailableForApi = new AtomicInteger(threadsAvailable); } - + @Override public void destroy() { operationHandler.shutdown(); diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java index 947fcb637fb..35ff2e33b5d 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java @@ -18,7 +18,6 @@ import com.yahoo.vespa.http.client.core.ErrorCode; import com.yahoo.vespa.http.client.core.Headers; import com.yahoo.vespa.http.client.core.OperationStatus; import com.yahoo.vespaxmlparser.FeedOperation; -import com.yahoo.vespaxmlparser.VespaXMLFeedReader; import com.yahoo.yolean.Exceptions; import java.io.IOException; diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java index 4cb82e74db6..58ca3697095 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java @@ -7,7 +7,6 @@ import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; import com.yahoo.container.jdisc.messagebus.SessionCache; -import com.yahoo.container.logging.AccessLog; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.documentapi.metrics.DocumentApiMetrics; @@ -23,7 +22,6 @@ import com.yahoo.yolean.Exceptions; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.concurrent.Executor; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -33,7 +31,7 @@ import java.util.logging.Logger; * This code is based on v2 code, however, in v3, one client has one ClientFeederV3 shared between all client threads. * The new API has more logic for shutting down cleanly as the server is more likely to be upgraded. * The code is restructured a bit. - * + * * @author dybis */ public class FeedHandlerV3 extends LoggingRequestHandler { diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/OperationHandlerImplTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/OperationHandlerImplTest.java index 5ac01b20335..374c91c13d3 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/OperationHandlerImplTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/OperationHandlerImplTest.java @@ -353,8 +353,7 @@ public class OperationHandlerImplTest { @Test public void api_root_visiting_throws_exception_on_unknown_bucket_space_name() throws Exception { try { - VisitorParameters parameters = generatedVisitParametersFrom(apiRootVisitUri(), "", - optionsBuilder().cluster("foo").bucketSpace("langbein").build()); + generatedVisitParametersFrom(apiRootVisitUri(), "", optionsBuilder().cluster("foo").bucketSpace("langbein").build()); } catch (RestApiException e) { assertThat(e.getResponse().getStatus(), is(400)); assertThat(renderRestApiExceptionAsString(e), containsString( diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/MockedOperationHandler.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/MockedOperationHandler.java index 1e982c7b700..895c34436ce 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/MockedOperationHandler.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/MockedOperationHandler.java @@ -6,7 +6,6 @@ import com.yahoo.document.restapi.Response; import com.yahoo.document.restapi.RestApiException; import com.yahoo.document.restapi.RestUri; import com.yahoo.vespaxmlparser.FeedOperation; -import com.yahoo.vespaxmlparser.VespaXMLFeedReader; import java.util.Optional; diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/feedhandler/v3/FeedTesterV3.java b/vespaclient-container-plugin/src/test/java/com/yahoo/feedhandler/v3/FeedTesterV3.java index fd9655fb838..4f58e628974 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/feedhandler/v3/FeedTesterV3.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/feedhandler/v3/FeedTesterV3.java @@ -103,7 +103,7 @@ public class FeedTesterV3 { new FeedHandlerV3.Context(threadPool, AccessLog.voidAccessLog(), new NullFeedMetric(true)), docMan, null /* session cache */, - null /* thread pool config */, + null /* thread pool config */, new DocumentApiMetrics(MetricReceiver.nullImplementation, "test")) { @Override protected ReferencedResource<SharedSourceSession> retainSource( @@ -111,7 +111,7 @@ public class FeedTesterV3 { SharedSourceSession sharedSourceSession = mock(SharedSourceSession.class); try { - Mockito.stub(sharedSourceSession.sendMessageBlocking(anyObject())).toAnswer((Answer) invocation -> { + Mockito.stub(sharedSourceSession.sendMessageBlocking(anyObject())).toAnswer((Answer<?>) invocation -> { Object[] args = invocation.getArguments(); PutDocumentMessage putDocumentMessage = (PutDocumentMessage) args[0]; ReplyContext replyContext = (ReplyContext)putDocumentMessage.getContext(); diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/MetaStream.java b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/MetaStream.java index 363abd9efc8..d0ebd1e6ee3 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/MetaStream.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/MetaStream.java @@ -23,7 +23,7 @@ public final class MetaStream extends ByteArrayInputStream { private static final byte[] createPayload(byte[] buf) { StringBuilder bu = new StringBuilder(); - for (byte b : buf) { + for (int i = 0; i < buf.length; i++) { bu.append("id:banana:banana::doc1 0\n"); } return Utf8.toBytes(bu.toString()); |