|
22 | 22 | import com.arpnetworking.utility.DefaultHostNameResolver;
|
23 | 23 | import com.arpnetworking.utility.HostNameResolver;
|
24 | 24 | import com.google.common.collect.EvictingQueue;
|
| 25 | +import io.vertx.core.AsyncResult; |
| 26 | +import io.vertx.core.Context; |
| 27 | +import io.vertx.core.Handler; |
| 28 | +import io.vertx.core.Vertx; |
| 29 | +import io.vertx.core.buffer.Buffer; |
| 30 | +import io.vertx.core.net.NetClient; |
| 31 | +import io.vertx.core.net.NetClientOptions; |
| 32 | +import io.vertx.core.net.NetSocket; |
25 | 33 | import net.sf.oval.constraint.Min;
|
26 | 34 | import net.sf.oval.constraint.NotEmpty;
|
27 | 35 | import net.sf.oval.constraint.NotNull;
|
28 | 36 | import net.sf.oval.constraint.Range;
|
29 |
| -import org.vertx.java.core.AsyncResult; |
30 |
| -import org.vertx.java.core.AsyncResultHandler; |
31 |
| -import org.vertx.java.core.Context; |
32 |
| -import org.vertx.java.core.Handler; |
33 |
| -import org.vertx.java.core.Vertx; |
34 |
| -import org.vertx.java.core.VertxFactory; |
35 |
| -import org.vertx.java.core.buffer.Buffer; |
36 |
| -import org.vertx.java.core.impl.DefaultContext; |
37 |
| -import org.vertx.java.core.impl.DefaultVertx; |
38 |
| -import org.vertx.java.core.net.NetClient; |
39 |
| -import org.vertx.java.core.net.NetSocket; |
40 | 37 |
|
41 | 38 | import java.time.Duration;
|
42 | 39 | import java.time.ZonedDateTime;
|
@@ -342,26 +339,15 @@ protected VertxSink(final Builder<?, ?> builder) {
|
342 | 339 | _serverAddress = builder._serverAddress;
|
343 | 340 | _hostnameResolver = builder._hostnameResolver;
|
344 | 341 | _serverPort = builder._serverPort;
|
345 |
| - _vertx = VertxFactory.newVertx(); |
346 |
| - //Calling this just so the context gets created |
347 |
| - if (_vertx instanceof DefaultVertx) { |
348 |
| - final DefaultVertx vertx = (DefaultVertx) _vertx; |
349 |
| - final DefaultContext context = vertx.getOrCreateContext(); |
350 |
| - vertx.setContext(context); |
351 |
| - _context = context; |
352 |
| - } else { |
353 |
| - _context = null; |
354 |
| - LOGGER.warn() |
355 |
| - .setMessage("Vertx instance not a DefaultVertx as expected. Threading may be incorrect.") |
356 |
| - .addData("sink", getName()) |
357 |
| - .log(); |
358 |
| - } |
359 |
| - |
360 |
| - _client = _vertx.createNetClient() |
361 |
| - .setReconnectAttempts(0) |
362 |
| - .setConnectTimeout(5000) |
363 |
| - .setTCPNoDelay(true) |
364 |
| - .setTCPKeepAlive(true); |
| 342 | + _vertx = Vertx.vertx(); |
| 343 | + _context = _vertx.getOrCreateContext(); |
| 344 | + |
| 345 | + _client = _vertx.createNetClient( |
| 346 | + new NetClientOptions() |
| 347 | + .setReconnectAttempts(0) |
| 348 | + .setConnectTimeout(5000) |
| 349 | + .setTcpNoDelay(true) |
| 350 | + .setTcpKeepAlive(true)); |
365 | 351 | _socket = new AtomicReference<>();
|
366 | 352 | _pendingData = EvictingQueue.create(builder._maxQueueSize);
|
367 | 353 | _exponentialBackoffBase = builder._exponentialBackoffBase;
|
@@ -390,7 +376,7 @@ protected VertxSink(final Builder<?, ?> builder) {
|
390 | 376 | private static final long MAX_FLUSH_BYTES = 2 ^ 20; // 1 Mebibyte
|
391 | 377 | private static final int NO_DATA_CONSUME_LOOP_INTERVAL = 100;
|
392 | 378 |
|
393 |
| - private class ConnectionHandler implements AsyncResultHandler<NetSocket> { |
| 379 | + private class ConnectionHandler implements Handler<AsyncResult<NetSocket>> { |
394 | 380 |
|
395 | 381 | @Override
|
396 | 382 | public void handle(final AsyncResult<NetSocket> event) {
|
|
0 commit comments