diff --git a/pom.xml b/pom.xml index ba6eb7a2..55e9447d 100644 --- a/pom.xml +++ b/pom.xml @@ -138,9 +138,8 @@ 0.14.1 1.3.1 5.20.0 - 4.0.56.Final + 4.2.7.Final 4.0.21.Final - 4.2.6.Final 1.9.31 3.2.1 3.0.9 @@ -860,11 +859,6 @@ async-http-client ${asynchttpclient.version} - - io.netty - netty-codec-http - ${netty.codec.http.version} - org.playframework play-ahc-ws-standalone_${scala.version} @@ -976,6 +970,13 @@ import pom + + io.netty + netty-bom + ${netty.version} + import + pom + diff --git a/src/main/java/com/arpnetworking/tsdcore/sinks/HttpPostSink.java b/src/main/java/com/arpnetworking/tsdcore/sinks/HttpPostSink.java index ca3f64f5..2ef5e1b7 100644 --- a/src/main/java/com/arpnetworking/tsdcore/sinks/HttpPostSink.java +++ b/src/main/java/com/arpnetworking/tsdcore/sinks/HttpPostSink.java @@ -25,8 +25,6 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import io.netty.handler.codec.http.HttpHeaderNames; -import io.netty.handler.codec.http.HttpHeaderValues; import net.sf.oval.Validator; import net.sf.oval.constraint.CheckWith; import net.sf.oval.constraint.CheckWithCheck; @@ -127,12 +125,12 @@ protected RequestInfo createRequest(final AsyncHttpClient client, final byte[] s final RequestBuilder requestBuilder = new RequestBuilder() .setUri(getAysncHttpClientUri()) - .setHeader(HttpHeaderNames.CONTENT_TYPE, MediaTypes.APPLICATION_JSON.toString()) + .setHeader("Content-Type", MediaTypes.APPLICATION_JSON.toString()) .setBody(bodyData) .setMethod(HttpConstants.Methods.POST); if (_enableCompression) { - requestBuilder.setHeader(HttpHeaderNames.CONTENT_ENCODING, HttpHeaderValues.GZIP); + requestBuilder.setHeader("Content-Encoding", "gzip"); } return new RequestInfo(requestBuilder.build(), serializedData.length, bodyData.length); diff --git a/src/main/java/com/arpnetworking/tsdcore/sinks/KairosDbSink.java b/src/main/java/com/arpnetworking/tsdcore/sinks/KairosDbSink.java index e3fd81c8..802d2919 100644 --- a/src/main/java/com/arpnetworking/tsdcore/sinks/KairosDbSink.java +++ b/src/main/java/com/arpnetworking/tsdcore/sinks/KairosDbSink.java @@ -35,7 +35,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.netty.handler.codec.http.HttpHeaderNames; import it.unimi.dsi.fastutil.doubles.Double2LongMap; import net.sf.oval.constraint.Min; import net.sf.oval.constraint.NotNull; @@ -177,7 +176,7 @@ protected RequestInfo createRequest(final AsyncHttpClient client, final byte[] s final RequestBuilder requestBuilder = new RequestBuilder() .setUri(getAysncHttpClientUri()) - .setHeader(HttpHeaderNames.CONTENT_TYPE, "application/gzip") + .setHeader("Content-Type", "application/gzip") .setBody(bodyData) .setMethod(HttpConstants.Methods.POST);