cleanup

Author: jaydeluca

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java

@@ -6,53 +6,47 @@
 package io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server.base;
 
 import io.opentelemetry.instrumentation.spring.webflux.server.AbstractImmediateHandlerSpringWebFluxServerTest;
+import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
 
 class ImmediateHandlerSpringWebFluxServerTest
     extends AbstractImmediateHandlerSpringWebFluxServerTest {
-  //  @Override
-  //  protected Class<?> getApplicationClass() {
-  //    return Application.class;
-  //  }
-  //
-  //  @Configuration
-  //  @EnableAutoConfiguration
-  //  static class Application {
-  //    @Bean
-  //    RouterFunction<ServerResponse> router() {
-  //      return new RouteFactory().createRoutes();
-  //    }
-  //
-  //    @Bean
-  //    NettyReactiveWebServerFactory nettyFactory() {
-  //      return new NettyReactiveWebServerFactory();
-  //    }
-  //  }
-  //
-  //  static class RouteFactory extends ServerTestRouteFactory {
-  //
-  //    @Override
-  //    protected Mono<ServerResponse> wrapResponse(
-  //        ServerEndpoint endpoint, Mono<ServerResponse> response, Runnable spanAction) {
-  //      return controller(
-  //          endpoint,
-  //          () -> {
-  //            spanAction.run();
-  //            return response;
-  //          });
-  //    }
-  //  }
-  //
-  //  @Test
-  //  void nestedPath() {
-  //    assumeTrue(Boolean.getBoolean("testLatestDeps"));
-  //
-  //    String method = "GET";
-  //    AggregatedHttpRequest request = request(NESTED_PATH, method);
-  //    AggregatedHttpResponse response = client.execute(request).aggregate().join();
-  //    assertThat(response.status().code()).isEqualTo(NESTED_PATH.getStatus());
-  //    assertThat(response.contentUtf8()).isEqualTo(NESTED_PATH.getBody());
-  //    assertResponseHasCustomizedHeaders(response, NESTED_PATH, null);
-  //
-  //    assertTheTraces(1, null, null, null, method, NESTED_PATH);
-  //  }
+  @Override
+  protected Class<?> getApplicationClass() {
+    return Application.class;
+  }
+
+  @Configuration
+  @EnableAutoConfiguration
+  static class Application {
+    @Bean
+    RouterFunction<ServerResponse> router() {
+      return new RouteFactory().createRoutes();
+    }
+
+    @Bean
+    NettyReactiveWebServerFactory nettyFactory() {
+      return new NettyReactiveWebServerFactory();
+    }
+  }
+
+  static class RouteFactory extends ServerTestRouteFactory {
+
+    @Override
+    protected Mono<ServerResponse> wrapResponse(
+        ServerEndpoint endpoint, Mono<ServerResponse> response, Runnable spanAction) {
+      return controller(
+          endpoint,
+          () -> {
+            spanAction.run();
+            return response;
+          });
+    }
+  }
 }

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ImmediateHandlerSpringWebFluxServerTest.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server.base;
 
-import static io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server.base.SpringWebFluxServerTest.NESTED_PATH;
+import static io.opentelemetry.instrumentation.spring.webflux.server.AbstractSpringWebFluxServerTest.NESTED_PATH;
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.path;
 import static org.springframework.web.reactive.function.server.RouterFunctions.nest;
@@ -106,12 +106,7 @@ public RouterFunction<ServerResponse> createRoutes() {
             path("/nestedPath"),
             nest(
                 path("/hello"),
-                route(
-                    path("/world"),
-                    request -> {
-                      ServerEndpoint endpoint = NESTED_PATH;
-                      return respond(endpoint, null, null, null);
-                    })));
+                route(path("/world"), request -> respond(NESTED_PATH, null, null, null))));
   }
 
   protected Mono<ServerResponse> respond(