From e692605a3bf35dbf48e6685c752daabd1a892602 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Wed, 10 Jul 2019 14:18:54 -0600 Subject: [PATCH] Fix formatting --- .../test/groovy/VertxRxWebClientTest.groovy | 2 +- .../src/test/java/VertxRxWebTestServer.java | 120 +++++++++--------- 2 files changed, 63 insertions(+), 59 deletions(-) diff --git a/dd-java-agent/instrumentation/vertx/src/test/groovy/VertxRxWebClientTest.groovy b/dd-java-agent/instrumentation/vertx/src/test/groovy/VertxRxWebClientTest.groovy index 854fb2a4be..fc556865c4 100644 --- a/dd-java-agent/instrumentation/vertx/src/test/groovy/VertxRxWebClientTest.groovy +++ b/dd-java-agent/instrumentation/vertx/src/test/groovy/VertxRxWebClientTest.groovy @@ -13,7 +13,7 @@ class VertxRxWebClientTest extends HttpClientTest { @Shared Vertx vertx = Vertx.vertx(new VertxOptions()) @Shared - WebClient client = WebClient.create(vertx); + WebClient client = WebClient.create(vertx) @Override int doRequest(String method, URI uri, Map headers, Closure callback) { diff --git a/dd-java-agent/instrumentation/vertx/src/test/java/VertxRxWebTestServer.java b/dd-java-agent/instrumentation/vertx/src/test/java/VertxRxWebTestServer.java index 723a7771cc..521253c268 100644 --- a/dd-java-agent/instrumentation/vertx/src/test/java/VertxRxWebTestServer.java +++ b/dd-java-agent/instrumentation/vertx/src/test/java/VertxRxWebTestServer.java @@ -26,16 +26,16 @@ public class VertxRxWebTestServer extends AbstractVerticle { final Vertx vertx = Vertx.vertx(new VertxOptions().setClusterPort(port)); vertx.deployVerticle( - VertxRxWebTestServer.class.getName(), - new DeploymentOptions() - .setConfig(new JsonObject().put(CONFIG_HTTP_SERVER_PORT, port)) - .setInstances(3), - res -> { - if (!res.succeeded()) { - throw new RuntimeException("Cannot deploy server Verticle", res.cause()); - } - future.complete(null); - }); + VertxRxWebTestServer.class.getName(), + new DeploymentOptions() + .setConfig(new JsonObject().put(CONFIG_HTTP_SERVER_PORT, port)) + .setInstances(3), + res -> { + if (!res.succeeded()) { + throw new RuntimeException("Cannot deploy server Verticle", res.cause()); + } + future.complete(null); + }); future.get(); @@ -44,69 +44,73 @@ public class VertxRxWebTestServer extends AbstractVerticle { @Override public void start(final Future startFuture) { -// final io.vertx.reactivex.core.Vertx vertx = new io.vertx.reactivex.core.Vertx(this.vertx); + // final io.vertx.reactivex.core.Vertx vertx = new io.vertx.reactivex.core.Vertx(this.vertx); final WebClient client = WebClient.create(vertx); final int port = config().getInteger(CONFIG_HTTP_SERVER_PORT); final Router router = Router.router(vertx); - final CircuitBreaker breaker = CircuitBreaker.create("my-circuit-breaker", vertx, - new CircuitBreakerOptions() - .setMaxFailures(5) // number of failure before opening the circuit - .setTimeout(2000) // consider a failure if the operation does not succeed in time -// .setFallbackOnFailure(true) // do we call the fallback on failure - .setResetTimeout(10000) // time spent in open state before attempting to re-try - ); + final CircuitBreaker breaker = + CircuitBreaker.create( + "my-circuit-breaker", + vertx, + new CircuitBreakerOptions() + .setMaxFailures(5) // number of failure before opening the circuit + .setTimeout(2000) // consider a failure if the operation does not succeed in time + // .setFallbackOnFailure(true) // do we call the fallback on failure + .setResetTimeout(10000) // time spent in open state before attempting to re-try + ); router - .route("/") - .handler( - routingContext -> { - routingContext.response().putHeader("content-type", "text/html").end("Hello World"); - }); + .route("/") + .handler( + routingContext -> { + routingContext.response().putHeader("content-type", "text/html").end("Hello World"); + }); router - .route("/error") - .handler( - routingContext -> { - routingContext.response().setStatusCode(500).end(); - }); + .route("/error") + .handler( + routingContext -> { + routingContext.response().setStatusCode(500).end(); + }); router - .route("/proxy") - .handler( - routingContext -> { - breaker.execute( - ctx -> { - client.get(port, "localhost", "/test") - .rxSendBuffer(Optional.ofNullable(routingContext.getBody()).orElse(Buffer.buffer())) - .subscribe( - response -> { - routingContext - .response() - .setStatusCode(response.statusCode()) - .end(response.body()); + .route("/proxy") + .handler( + routingContext -> { + breaker.execute( + ctx -> { + client + .get(port, "localhost", "/test") + .rxSendBuffer( + Optional.ofNullable(routingContext.getBody()).orElse(Buffer.buffer())) + .subscribe( + response -> { + routingContext + .response() + .setStatusCode(response.statusCode()) + .end(response.body()); + }); }); }); - }); router - .route("/test") - .handler( - routingContext -> { - tracedMethod(); - routingContext.next(); - }) - .blockingHandler(RoutingContext::next) - .handler( - routingContext -> { - routingContext.response().putHeader("content-type", "text/html").end("Hello World"); - }); + .route("/test") + .handler( + routingContext -> { + tracedMethod(); + routingContext.next(); + }) + .blockingHandler(RoutingContext::next) + .handler( + routingContext -> { + routingContext.response().putHeader("content-type", "text/html").end("Hello World"); + }); vertx - .createHttpServer() - .requestHandler(router::accept) - .listen(port, h -> startFuture.complete()); + .createHttpServer() + .requestHandler(router::accept) + .listen(port, h -> startFuture.complete()); } @Trace - private void tracedMethod() { - } + private void tracedMethod() {} }