up level nested class

Author: shalk

instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/DbCallingConnection.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.jdbc.test;
+
+import io.opentelemetry.instrumentation.jdbc.TestConnection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+class DbCallingConnection extends TestConnection {
+  final boolean usePreparedStatement;
+
+  DbCallingConnection(boolean usePreparedStatement) {
+    super(false);
+    this.usePreparedStatement = usePreparedStatement;
+  }
+
+  @Override
+  public DatabaseMetaData getMetaData() throws SQLException {
+    // simulate retrieving DB metadata from the DB itself
+    if (usePreparedStatement) {
+      prepareStatement("SELECT * from DB_METADATA").executeQuery();
+    } else {
+      createStatement().executeQuery("SELECT * from DB_METADATA");
+    }
+    return super.getMetaData();
+  }
+}

instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/JdbcInstrumentationTest.java

@@ -31,7 +31,6 @@
 import java.io.IOException;
 import java.sql.CallableStatement;
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.Driver;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -43,7 +42,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
@@ -1314,26 +1312,6 @@ void testHandleRecursiveStatements(
                             equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"))));
   }
 
-  static class DbCallingConnection extends TestConnection {
-    final boolean usePreparedStatement;
-
-    DbCallingConnection(boolean usePreparedStatement) {
-      super(false);
-      this.usePreparedStatement = usePreparedStatement;
-    }
-
-    @Override
-    public DatabaseMetaData getMetaData() throws SQLException {
-      // simulate retrieving DB metadata from the DB itself
-      if (usePreparedStatement) {
-        prepareStatement("SELECT * from DB_METADATA").executeQuery();
-      } else {
-        createStatement().executeQuery("SELECT * from DB_METADATA");
-      }
-      return super.getMetaData();
-    }
-  }
-
   // regression test for
   // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6015
   @DisplayName("test proxy statement")