Fix java http client tests (#14043)

Author: laurit

instrumentation/java-http-client/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/javahttpclient/JavaHttpClientTest.java

@@ -13,18 +13,20 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-public abstract class JavaHttpClientTest extends AbstractJavaHttpClientTest {
+class JavaHttpClientTest {
 
-  @RegisterExtension
-  static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forAgent();
+  abstract static class AbstractTest extends AbstractJavaHttpClientTest {
+    @RegisterExtension
+    static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forAgent();
 
-  @Override
-  protected HttpClient configureHttpClient(HttpClient httpClient) {
-    return httpClient;
+    @Override
+    protected HttpClient configureHttpClient(HttpClient httpClient) {
+      return httpClient;
+    }
   }
 
   @Nested
-  static class Http1ClientTest extends JavaHttpClientTest {
+  class Http1ClientTest extends AbstractTest {
 
     @Override
     protected void configureHttpClientBuilder(HttpClient.Builder httpClientBuilder) {
@@ -33,7 +35,7 @@ protected void configureHttpClientBuilder(HttpClient.Builder httpClientBuilder)
   }
 
   @Nested
-  static class Http2ClientTest extends JavaHttpClientTest {
+  class Http2ClientTest extends AbstractTest {
 
     @Override
     protected void configureHttpClientBuilder(HttpClient.Builder httpClientBuilder) {

instrumentation/java-http-client/library/src/test/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTest.java

@@ -14,24 +14,26 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-public abstract class JavaHttpClientTest extends AbstractJavaHttpClientTest {
+class JavaHttpClientTest {
 
-  @RegisterExtension
-  static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forLibrary();
+  abstract static class AbstractTest extends AbstractJavaHttpClientTest {
+    @RegisterExtension
+    static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forLibrary();
 
-  @Override
-  protected HttpClient configureHttpClient(HttpClient httpClient) {
-    return JavaHttpClientTelemetry.builder(testing.getOpenTelemetry())
-        .setCapturedRequestHeaders(
-            Collections.singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER))
-        .setCapturedResponseHeaders(
-            Collections.singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER))
-        .build()
-        .newHttpClient(httpClient);
+    @Override
+    protected HttpClient configureHttpClient(HttpClient httpClient) {
+      return JavaHttpClientTelemetry.builder(testing.getOpenTelemetry())
+          .setCapturedRequestHeaders(
+              Collections.singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER))
+          .setCapturedResponseHeaders(
+              Collections.singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER))
+          .build()
+          .newHttpClient(httpClient);
+    }
   }
 
   @Nested
-  static class Http1ClientTest extends JavaHttpClientTest {
+  class Http1ClientTest extends AbstractTest {
 
     @Override
     protected void configureHttpClientBuilder(HttpClient.Builder httpClientBuilder) {
@@ -40,7 +42,7 @@ protected void configureHttpClientBuilder(HttpClient.Builder httpClientBuilder)
   }
 
   @Nested
-  static class Http2ClientTest extends JavaHttpClientTest {
+  class Http2ClientTest extends AbstractTest {
 
     @Override
     protected void configureHttpClientBuilder(HttpClient.Builder httpClientBuilder) {