Repository: tinkerpop Updated Branches: refs/heads/master bdec663e9 -> b15a9c30a
Removed deprecated method usage for netty/http-core CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b15a9c30 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b15a9c30 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b15a9c30 Branch: refs/heads/master Commit: b15a9c30a332cf6201fb232908d11efa3660848b Parents: bdec663 Author: Stephen Mallette <[email protected]> Authored: Fri Sep 7 08:52:41 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Fri Sep 7 08:52:41 2018 -0400 ---------------------------------------------------------------------- .../tinkerpop/gremlin/driver/Channelizer.java | 3 +- .../tinkerpop/gremlin/driver/Handler.java | 5 ++-- .../driver/handler/WebSocketClientHandler.java | 2 +- .../gremlin/driver/simple/WebSocketClient.java | 3 +- .../tinkerpop/gremlin/server/GremlinServer.java | 7 +++-- .../handler/HttpGremlinEndpointHandler.java | 24 ++++++++------- .../handler/SaslAuthenticationHandler.java | 7 ++--- .../server/handler/WebSocketHandlerUtil.java | 4 +-- .../handler/WsAndHttpChannelizerHandler.java | 9 ------ .../server/op/AbstractEvalOpProcessor.java | 4 +-- ...ctGremlinServerChannelizerIntegrateTest.java | 31 +++----------------- 11 files changed, 36 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java index c5d1cc5..dc898e4 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java @@ -19,6 +19,7 @@ package org.apache.tinkerpop.gremlin.driver; import io.netty.channel.Channel; +import io.netty.handler.codec.http.EmptyHttpHeaders; import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame; import io.netty.handler.codec.http.websocketx.PingWebSocketFrame; import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException; @@ -200,7 +201,7 @@ public interface Channelizer extends ChannelHandler { final int maxContentLength = cluster.connectionPoolSettings().maxContentLength; handler = new WebSocketClientHandler( WebSocketClientHandshakerFactory.newHandshaker( - connection.getUri(), WebSocketVersion.V13, null, false, HttpHeaders.EMPTY_HEADERS, maxContentLength)); + connection.getUri(), WebSocketVersion.V13, null, false, EmptyHttpHeaders.INSTANCE, maxContentLength)); pipeline.addLast("http-codec", new HttpClientCodec()); pipeline.addLast("aggregator", new HttpObjectAggregator(maxContentLength)); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java index 68e1631..ecd92e9 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java @@ -18,6 +18,7 @@ */ package org.apache.tinkerpop.gremlin.driver; +import io.netty.util.AttributeMap; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.tinkerpop.gremlin.driver.exception.ResponseException; import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; @@ -85,8 +86,8 @@ final class Handler { // We are only interested in AUTHENTICATE responses here. Everything else can // get passed down the pipeline if (response.getStatus().getCode() == ResponseStatusCode.AUTHENTICATE) { - final Attribute<SaslClient> saslClient = channelHandlerContext.attr(saslClientKey); - final Attribute<Subject> subject = channelHandlerContext.attr(subjectKey); + final Attribute<SaslClient> saslClient = ((AttributeMap) channelHandlerContext).attr(saslClientKey); + final Attribute<Subject> subject = ((AttributeMap) channelHandlerContext).attr(subjectKey); final RequestMessage.Builder messageBuilder = RequestMessage.build(Tokens.OPS_AUTHENTICATION); // First time through we don't have a sasl client if (saslClient.get() == null) { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java index 7b5858b..4f43afe 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java @@ -73,7 +73,7 @@ public final class WebSocketClientHandler extends SimpleChannelInboundHandler<Ob if (msg instanceof FullHttpResponse) { final FullHttpResponse response = (FullHttpResponse) msg; - throw new Exception("Unexpected FullHttpResponse (getStatus=" + response.getStatus() + ", content=" + throw new Exception("Unexpected FullHttpResponse (getStatus=" + response.status() + ", content=" + response.content().toString(CharsetUtil.UTF_8) + ')'); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java index cc7dd8f..3950339 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java @@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.driver.simple; import io.netty.buffer.PooledByteBufAllocator; import io.netty.channel.ChannelOption; +import io.netty.handler.codec.http.EmptyHttpHeaders; import io.netty.handler.codec.http.HttpHeaders; import org.apache.tinkerpop.gremlin.driver.MessageSerializer; import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler; @@ -67,7 +68,7 @@ public class WebSocketClient extends AbstractClient { final WebSocketClientHandler wsHandler = new WebSocketClientHandler( WebSocketClientHandshakerFactory.newHandshaker( - uri, WebSocketVersion.V13, null, false, HttpHeaders.EMPTY_HEADERS, 65536)); + uri, WebSocketVersion.V13, null, false, EmptyHttpHeaders.INSTANCE, 65536)); final MessageSerializer serializer = new GryoMessageSerializerV3d0(); b.channel(NioSocketChannel.class) .handler(new ChannelInitializer<SocketChannel>() { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java index 87fc95c..d0508a3 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java @@ -25,6 +25,7 @@ import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelOption; import io.netty.channel.EventLoopGroup; +import io.netty.channel.WriteBufferWaterMark; import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.epoll.EpollServerSocketChannel; import io.netty.channel.nio.NioEventLoopGroup; @@ -59,7 +60,7 @@ public class GremlinServer { static { // hook slf4j up to netty internal logging - InternalLoggerFactory.setDefaultFactory(new Slf4JLoggerFactory()); + InternalLoggerFactory.setDefaultFactory(Slf4JLoggerFactory.INSTANCE); } private static final String SERVER_THREAD_PREFIX = "gremlin-server-"; @@ -141,8 +142,8 @@ public class GremlinServer { // when high value is reached then the channel becomes non-writable and stays like that until the // low value is so that there is time to recover - b.childOption(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, settings.writeBufferHighWaterMark); - b.childOption(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, settings.writeBufferLowWaterMark); + b.childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, + new WriteBufferWaterMark(settings.writeBufferLowWaterMark, settings.writeBufferHighWaterMark)); b.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT); // fire off any lifecycle scripts that were provided by the user. hooks get initialized during http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java index 6292ddd..b4a0468 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java @@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.server.handler; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; import io.netty.handler.codec.TooLongFrameException; +import io.netty.handler.codec.http.HttpHeaderValues; +import io.netty.handler.codec.http.HttpUtil; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.tinkerpop.gremlin.driver.MessageSerializer; import org.apache.tinkerpop.gremlin.driver.Tokens; @@ -80,9 +82,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import static com.codahale.metrics.MetricRegistry.name; -import static io.netty.handler.codec.http.HttpHeaders.Names.*; -import static io.netty.handler.codec.http.HttpHeaders.is100ContinueExpected; -import static io.netty.handler.codec.http.HttpHeaders.isKeepAlive; +import static io.netty.handler.codec.http.HttpHeaderNames.ACCESS_CONTROL_ALLOW_ORIGIN; +import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION; +import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH; +import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE; +import static io.netty.handler.codec.http.HttpHeaderNames.ORIGIN; import static io.netty.handler.codec.http.HttpMethod.GET; import static io.netty.handler.codec.http.HttpMethod.POST; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; @@ -143,17 +147,17 @@ public class HttpGremlinEndpointHandler extends ChannelInboundHandlerAdapter { if (msg instanceof FullHttpRequest) { final FullHttpRequest req = (FullHttpRequest) msg; - if ("/favicon.ico".equals(req.getUri())) { + if ("/favicon.ico".equals(req.uri())) { sendError(ctx, NOT_FOUND, "Gremlin Server doesn't have a favicon.ico"); ReferenceCountUtil.release(msg); return; } - if (is100ContinueExpected(req)) { + if (HttpUtil.is100ContinueExpected(req)) { ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE)); } - if (req.getMethod() != GET && req.getMethod() != POST) { + if (req.method() != GET && req.method() != POST) { sendError(ctx, METHOD_NOT_ALLOWED, METHOD_NOT_ALLOWED.toString()); ReferenceCountUtil.release(msg); return; @@ -177,7 +181,7 @@ public class HttpGremlinEndpointHandler extends ChannelInboundHandlerAdapter { } final String origin = req.headers().get(ORIGIN); - final boolean keepAlive = isKeepAlive(req); + final boolean keepAlive = HttpUtil.isKeepAlive(req); // not using the req any where below here - assume it is safe to release at this point. ReferenceCountUtil.release(msg); @@ -208,7 +212,7 @@ public class HttpGremlinEndpointHandler extends ChannelInboundHandlerAdapter { if (!keepAlive) { ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); } else { - response.headers().set(CONNECTION, HttpHeaders.Values.KEEP_ALIVE); + response.headers().set(CONNECTION, HttpHeaderValues.KEEP_ALIVE); ctx.writeAndFlush(response); } } @@ -345,8 +349,8 @@ public class HttpGremlinEndpointHandler extends ChannelInboundHandlerAdapter { } private static Quartet<String, Map<String, Object>, String, Map<String,String>> getRequestArguments(final FullHttpRequest request) { - if (request.getMethod() == GET) { - final QueryStringDecoder decoder = new QueryStringDecoder(request.getUri()); + if (request.method() == GET) { + final QueryStringDecoder decoder = new QueryStringDecoder(request.uri()); final List<String> gremlinParms = decoder.parameters().get(Tokens.ARGS_GREMLIN); if (null == gremlinParms || gremlinParms.size() == 0) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java index 0e8fa1a..e7bcbc7 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java @@ -21,8 +21,6 @@ package org.apache.tinkerpop.gremlin.server.handler; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.handler.codec.base64.Base64Decoder; import io.netty.util.Attribute; import java.net.InetAddress; @@ -32,6 +30,7 @@ import java.util.Base64; import java.util.HashMap; import java.util.Map; +import io.netty.util.AttributeMap; import org.apache.tinkerpop.gremlin.driver.Tokens; import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; @@ -72,8 +71,8 @@ public class SaslAuthenticationHandler extends AbstractAuthenticationHandler { if (msg instanceof RequestMessage){ final RequestMessage requestMessage = (RequestMessage) msg; - final Attribute<Authenticator.SaslNegotiator> negotiator = ctx.attr(StateKey.NEGOTIATOR); - final Attribute<RequestMessage> request = ctx.attr(StateKey.REQUEST_MESSAGE); + final Attribute<Authenticator.SaslNegotiator> negotiator = ((AttributeMap) ctx).attr(StateKey.NEGOTIATOR); + final Attribute<RequestMessage> request = ((AttributeMap) ctx).attr(StateKey.REQUEST_MESSAGE); if (negotiator.get() == null) { // First time through so save the request and send an AUTHENTICATE challenge with no data negotiator.set(authenticator.newSaslNegotiator(getRemoteInetAddress(ctx))); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java index 2d571c0..26711c2 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java @@ -20,8 +20,8 @@ package org.apache.tinkerpop.gremlin.server.handler; import io.netty.handler.codec.http.HttpMessage; -import static io.netty.handler.codec.http.HttpHeaders.Names.UPGRADE; -import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION; +import static io.netty.handler.codec.http.HttpHeaderNames.UPGRADE; +import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION; /** * A class to handle common WebSocket operations http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java index 01579a3..e4f79b4 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java @@ -22,21 +22,12 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelPipeline; -import io.netty.channel.EventLoopGroup; import io.netty.handler.codec.http.HttpMessage; -import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; -import io.netty.handler.codec.http.HttpServerCodec; import org.apache.tinkerpop.gremlin.server.Channelizer; -import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer; import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer; import org.apache.tinkerpop.gremlin.server.channel.WsAndHttpChannelizer; -import org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler; -import org.apache.tinkerpop.gremlin.server.handler.WsAndHttpChannelizerHandler; -import org.apache.tinkerpop.gremlin.server.handler.WebSocketHandlerUtil; import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor; -import static io.netty.handler.codec.http.HttpHeaders.Names.UPGRADE; -import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION; import static org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer.PIPELINE_AUTHENTICATOR; import static org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer.PIPELINE_REQUEST_HANDLER; import static org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer.PIPELINE_HTTP_RESPONSE_ENCODER; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java index fa30a26..e26d0d6 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java @@ -29,7 +29,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Operator; import org.apache.tinkerpop.gremlin.process.traversal.Order; import org.apache.tinkerpop.gremlin.process.traversal.Pop; import org.apache.tinkerpop.gremlin.process.traversal.Scope; -import org.apache.tinkerpop.gremlin.server.OpProcessor; import org.apache.tinkerpop.gremlin.structure.Column; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.server.Context; @@ -39,7 +38,7 @@ import org.apache.tinkerpop.gremlin.server.Settings; import org.apache.tinkerpop.gremlin.server.util.MetricManager; import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import io.netty.channel.ChannelHandlerContext; + import org.codehaus.groovy.control.MultipleCompilationErrorsException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +54,6 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; -import java.util.regex.Pattern; import static com.codahale.metrics.MetricRegistry.name; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b15a9c30/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlinServerChannelizerIntegrateTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlinServerChannelizerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlinServerChannelizerIntegrateTest.java index d68d890..b604254 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlinServerChannelizerIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlinServerChannelizerIntegrateTest.java @@ -18,30 +18,23 @@ */ package org.apache.tinkerpop.gremlin.server.channel; +import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.tinkerpop.gremlin.driver.AuthProperties; import org.apache.tinkerpop.gremlin.driver.Client; import org.apache.tinkerpop.gremlin.driver.Cluster; -import org.apache.tinkerpop.gremlin.driver.Client; -import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient; import org.apache.tinkerpop.gremlin.driver.Channelizer; import org.apache.tinkerpop.gremlin.server.AbstractGremlinServerIntegrationTest; -import org.apache.tinkerpop.gremlin.server.channel.WsAndHttpChannelizer; import org.apache.tinkerpop.gremlin.server.Settings; import org.apache.tinkerpop.gremlin.server.TestClientFactory; - import org.apache.http.Consts; import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.socket.ConnectionSocketFactory; -import org.apache.http.conn.ssl.AllowAllHostnameVerifier; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLContextBuilder; -import org.apache.http.conn.ssl.TrustSelfSignedStrategy; -import org.apache.http.conn.ssl.TrustStrategy; +import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.CloseableHttpClient; @@ -49,19 +42,9 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.util.EntityUtils; import org.apache.tinkerpop.shaded.jackson.databind.JsonNode; import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper; -import org.junit.After; -import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.rules.ExternalResource; -import java.io.File; -import java.io.InputStream; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; import java.util.Base64; -import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -221,15 +204,9 @@ abstract class AbstractGremlinServerChannelizerIntegrateTest extends AbstractGre private CloseableHttpClient createSslHttpClient() throws Exception { final SSLContextBuilder wsBuilder = new SSLContextBuilder(); - wsBuilder.loadTrustMaterial(null, new TrustStrategy() { - @Override - public boolean isTrusted(X509Certificate[] chain, - String authType) throws CertificateException { - return true; - } - }); + wsBuilder.loadTrustMaterial(null, (chain, authType) -> true); final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(wsBuilder.build(), - new AllowAllHostnameVerifier()); + new NoopHostnameVerifier()); //This winds up using a PoolingHttpClientConnectionManager so need to pass the //RegistryBuilder final Registry<ConnectionSocketFactory> registry = RegistryBuilder
