Skip to content

Commit cdf5d34

Browse files
Bump vertx-core from 2.1.6 to 4.4.2 (#292)
* Bump vertx-core from 2.1.6 to 4.4.2 Bumps [vertx-core](https://github.com/eclipse/vert.x) from 2.1.6 to 4.4.2. - [Commits](eclipse-vertx/vert.x@v2.1.6...4.4.2) --- updated-dependencies: - dependency-name: io.vertx:vertx-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * fixed build --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brandon Arp <[email protected]>
1 parent ec707e5 commit cdf5d34

File tree

4 files changed

+28
-36
lines changed

4 files changed

+28
-36
lines changed

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<snappy.version>1.1.9.1</snappy.version>
106106
<spotbugs.annotations.version>4.7.1</spotbugs.annotations.version>
107107
<typesafe.config.version>1.4.2</typesafe.config.version>
108-
<vertx.core.version>2.1.6</vertx.core.version>
108+
<vertx.core.version>4.4.2</vertx.core.version>
109109

110110
<!--Test dependency versions-->
111111
<commons.math3.version>3.6.1</commons.math3.version>
@@ -791,6 +791,12 @@
791791
</exclusion>
792792
</exclusions>
793793
</dependency>
794+
<dependency>
795+
<groupId>io.vertx</groupId>
796+
<artifactId>vertx-codegen</artifactId>
797+
<version>${vertx.core.version}</version>
798+
<scope>provided</scope>
799+
</dependency>
794800
<dependency>
795801
<groupId>org.apache.httpcomponents</groupId>
796802
<artifactId>httpcore</artifactId>

src/main/java/com/arpnetworking/tsdcore/model/AggregationMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import akka.util.ByteStringBuilder;
2020
import com.arpnetworking.metrics.aggregation.protocol.Messages;
2121
import com.google.protobuf.GeneratedMessageV3;
22-
import org.vertx.java.core.buffer.Buffer;
22+
import io.vertx.core.buffer.Buffer;
2323

2424
import java.io.IOException;
2525
import java.nio.ByteOrder;
@@ -47,7 +47,7 @@ public static AggregationMessage create(final GeneratedMessageV3 message) {
4747
* @return ${code Buffer} containing serialized message.
4848
*/
4949
public Buffer serializeToBuffer() {
50-
final Buffer b = new Buffer();
50+
final Buffer b = Buffer.buffer();
5151
b.appendInt(0);
5252
if (_message instanceof Messages.HostIdentification) {
5353
b.appendByte((byte) 0x01);

src/main/java/com/arpnetworking/tsdcore/sinks/VertxSink.java

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,18 @@
2222
import com.arpnetworking.utility.DefaultHostNameResolver;
2323
import com.arpnetworking.utility.HostNameResolver;
2424
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;
2533
import net.sf.oval.constraint.Min;
2634
import net.sf.oval.constraint.NotEmpty;
2735
import net.sf.oval.constraint.NotNull;
2836
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;
4037

4138
import java.time.Duration;
4239
import java.time.ZonedDateTime;
@@ -342,26 +339,15 @@ protected VertxSink(final Builder<?, ?> builder) {
342339
_serverAddress = builder._serverAddress;
343340
_hostnameResolver = builder._hostnameResolver;
344341
_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));
365351
_socket = new AtomicReference<>();
366352
_pendingData = EvictingQueue.create(builder._maxQueueSize);
367353
_exponentialBackoffBase = builder._exponentialBackoffBase;
@@ -390,7 +376,7 @@ protected VertxSink(final Builder<?, ?> builder) {
390376
private static final long MAX_FLUSH_BYTES = 2 ^ 20; // 1 Mebibyte
391377
private static final int NO_DATA_CONSUME_LOOP_INTERVAL = 100;
392378

393-
private class ConnectionHandler implements AsyncResultHandler<NetSocket> {
379+
private class ConnectionHandler implements Handler<AsyncResult<NetSocket>> {
394380

395381
@Override
396382
public void handle(final AsyncResult<NetSocket> event) {

src/test/java/com/arpnetworking/tsdcore/model/AggregationMessageTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import com.arpnetworking.metrics.aggregation.protocol.Messages;
2020
import com.google.protobuf.GeneratedMessageV3;
2121
import com.google.protobuf.UnknownFieldSet;
22+
import io.vertx.core.buffer.Buffer;
2223
import org.junit.Assert;
2324
import org.junit.Test;
2425
import org.mockito.Mockito;
25-
import org.vertx.java.core.buffer.Buffer;
2626

2727
import java.nio.ByteOrder;
2828

0 commit comments

Comments
 (0)