JAVA-2135: Refactor integration test packages

apache · Aug 12, 2019 · 0755043 · 0755043
1 parent 1a5abb1
commit 0755043
Show file tree

Hide file tree

Showing 65 changed files with 220 additions and 111 deletions.
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryPolicy.java
@@ -59,26 +59,27 @@ public class DefaultRetryPolicy implements RetryPolicy {
   private static final Logger LOG = LoggerFactory.getLogger(DefaultRetryPolicy.class);
 
   @VisibleForTesting
-  static final String RETRYING_ON_READ_TIMEOUT =
+  public static final String RETRYING_ON_READ_TIMEOUT =
       "[{}] Retrying on read timeout on same host (consistency: {}, required responses: {}, "
           + "received responses: {}, data retrieved: {}, retries: {})";
 
   @VisibleForTesting
-  static final String RETRYING_ON_WRITE_TIMEOUT =
+  public static final String RETRYING_ON_WRITE_TIMEOUT =
       "[{}] Retrying on write timeout on same host (consistency: {}, write type: {}, "
           + "required acknowledgments: {}, received acknowledgments: {}, retries: {})";
 
   @VisibleForTesting
-  static final String RETRYING_ON_UNAVAILABLE =
+  public static final String RETRYING_ON_UNAVAILABLE =
       "[{}] Retrying on unavailable exception on next host (consistency: {}, "
           + "required replica: {}, alive replica: {}, retries: {})";
 
   @VisibleForTesting
-  static final String RETRYING_ON_ABORTED =
+  public static final String RETRYING_ON_ABORTED =
       "[{}] Retrying on aborted request on next host (retries: {})";
 
   @VisibleForTesting
-  static final String RETRYING_ON_ERROR = "[{}] Retrying on node error on next host (retries: {})";
+  public static final String RETRYING_ON_ERROR =
+      "[{}] Retrying on node error on next host (retries: {})";
 
   private final String logPrefix;
 

diff --git a/...tastax/oss/driver/api/core/ConnectIT.java → ...m/datastax/oss/driver/core/ConnectIT.java b/...tastax/oss/driver/api/core/ConnectIT.java → ...m/datastax/oss/driver/core/ConnectIT.java
@@ -13,13 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core;
+package com.datastax.oss.driver.core;
 
 import static com.datastax.oss.driver.api.testinfra.utils.ConditionChecker.checkThat;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static junit.framework.TestCase.fail;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.datastax.oss.driver.api.core.AllNodesFailedException;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.DriverException;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
 import com.datastax.oss.driver.api.core.context.DriverContext;

diff --git a/...ss/driver/api/core/ConnectKeyspaceIT.java → ...ax/oss/driver/core/ConnectKeyspaceIT.java b/...ss/driver/api/core/ConnectKeyspaceIT.java → ...ax/oss/driver/core/ConnectKeyspaceIT.java
@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core;
+package com.datastax.oss.driver.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.InvalidKeyspaceException;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
 import com.datastax.oss.driver.api.core.session.Session;

diff --git a/.../ProtocolVersionInitialNegotiationIT.java → .../ProtocolVersionInitialNegotiationIT.java b/.../ProtocolVersionInitialNegotiationIT.java → .../ProtocolVersionInitialNegotiationIT.java
@@ -13,11 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core;
+package com.datastax.oss.driver.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+import com.datastax.oss.driver.api.core.AllNodesFailedException;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.DefaultProtocolVersion;
+import com.datastax.oss.driver.api.core.UnsupportedProtocolVersionException;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
 import com.datastax.oss.driver.api.testinfra.CassandraRequirement;

diff --git a/...i/core/ProtocolVersionMixedClusterIT.java → ...r/core/ProtocolVersionMixedClusterIT.java b/...i/core/ProtocolVersionMixedClusterIT.java → ...r/core/ProtocolVersionMixedClusterIT.java
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core;
+package com.datastax.oss.driver.core;
 
 import static com.datastax.oss.driver.assertions.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.DefaultProtocolVersion;
+import com.datastax.oss.driver.api.core.UnsupportedProtocolVersionException;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;

diff --git a/...pi/core/auth/PlainTextAuthProviderIT.java → ...er/core/auth/PlainTextAuthProviderIT.java b/...pi/core/auth/PlainTextAuthProviderIT.java → ...er/core/auth/PlainTextAuthProviderIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.auth;
+package com.datastax.oss.driver.core.auth;
 
 import com.datastax.oss.driver.api.core.AllNodesFailedException;
 import com.datastax.oss.driver.api.core.CqlSession;

diff --git a/...core/compression/DirectCompressionIT.java → ...core/compression/DirectCompressionIT.java b/...core/compression/DirectCompressionIT.java → ...core/compression/DirectCompressionIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.compression;
+package com.datastax.oss.driver.core.compression;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;

diff --git a/...i/core/compression/HeapCompressionIT.java → ...r/core/compression/HeapCompressionIT.java b/...i/core/compression/HeapCompressionIT.java → ...r/core/compression/HeapCompressionIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.compression;
+package com.datastax.oss.driver.core.compression;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;

diff --git a/...core/config/DriverConfigValidationIT.java → ...core/config/DriverConfigValidationIT.java b/...core/config/DriverConfigValidationIT.java → ...core/config/DriverConfigValidationIT.java
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.config;
+package com.datastax.oss.driver.core.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
+import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.api.testinfra.simulacron.SimulacronRule;
 import com.datastax.oss.driver.categories.ParallelizableTests;

diff --git a/...core/config/DriverExecutionProfileIT.java → ...core/config/DriverExecutionProfileIT.java b/...core/config/DriverExecutionProfileIT.java → ...core/config/DriverExecutionProfileIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.config;
+package com.datastax.oss.driver.core.config;
 
 import static com.datastax.oss.simulacron.common.stubbing.PrimeDsl.noRows;
 import static com.datastax.oss.simulacron.common.stubbing.PrimeDsl.serverError;
@@ -25,6 +25,9 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.DriverTimeoutException;
+import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
+import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
 import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
 import com.datastax.oss.driver.api.core.cql.BatchStatement;
 import com.datastax.oss.driver.api.core.cql.BatchStatementBuilder;

diff --git a/...onfig/DriverExecutionProfileReloadIT.java → ...onfig/DriverExecutionProfileReloadIT.java b/...onfig/DriverExecutionProfileReloadIT.java → ...onfig/DriverExecutionProfileReloadIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.config;
+package com.datastax.oss.driver.core.config;
 
 import static com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader.DEFAULT_CONFIG_SUPPLIER;
 import static com.datastax.oss.simulacron.common.stubbing.PrimeDsl.noRows;

diff --git a/...re/connection/ChannelSocketOptionsIT.java → ...re/connection/ChannelSocketOptionsIT.java b/...re/connection/ChannelSocketOptionsIT.java → ...re/connection/ChannelSocketOptionsIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.connection;
+package com.datastax.oss.driver.core.connection;
 
 import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.SOCKET_KEEP_ALIVE;
 import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.SOCKET_LINGER_INTERVAL;

diff --git a/...er/api/core/connection/FrameLengthIT.java → ...driver/core/connection/FrameLengthIT.java b/...er/api/core/connection/FrameLengthIT.java → ...driver/core/connection/FrameLengthIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.connection;
+package com.datastax.oss.driver.core.connection;
 
 import static com.datastax.oss.simulacron.common.stubbing.PrimeDsl.noRows;
 import static com.datastax.oss.simulacron.common.stubbing.PrimeDsl.rows;
@@ -25,6 +25,7 @@
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.api.core.connection.FrameTooLongException;
 import com.datastax.oss.driver.api.core.context.DriverContext;
 import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;

diff --git a/...api/core/context/LifecycleListenerIT.java → ...ver/core/context/LifecycleListenerIT.java b/...api/core/context/LifecycleListenerIT.java → ...ver/core/context/LifecycleListenerIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.context;
+package com.datastax.oss.driver.core.context;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...driver/api/core/cql/AsyncResultSetIT.java → ...oss/driver/core/cql/AsyncResultSetIT.java b/...driver/api/core/cql/AsyncResultSetIT.java → ...oss/driver/core/cql/AsyncResultSetIT.java
@@ -13,12 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.cql;
+package com.datastax.oss.driver.core.cql;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
+import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
+import com.datastax.oss.driver.api.core.cql.BatchStatement;
+import com.datastax.oss.driver.api.core.cql.BatchStatementBuilder;
+import com.datastax.oss.driver.api.core.cql.DefaultBatchType;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;

diff --git a/...driver/api/core/cql/BatchStatementIT.java → ...oss/driver/core/cql/BatchStatementIT.java b/...driver/api/core/cql/BatchStatementIT.java → ...oss/driver/core/cql/BatchStatementIT.java
@@ -13,13 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.cql;
+package com.datastax.oss.driver.core.cql;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.api.core.cql.BatchStatement;
+import com.datastax.oss.driver.api.core.cql.BatchStatementBuilder;
+import com.datastax.oss.driver.api.core.cql.BoundStatement;
+import com.datastax.oss.driver.api.core.cql.DefaultBatchType;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
+import com.datastax.oss.driver.api.core.cql.Statement;
 import com.datastax.oss.driver.api.core.servererrors.InvalidQueryException;
 import com.datastax.oss.driver.api.testinfra.CassandraRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;

diff --git a/...driver/api/core/cql/BoundStatementIT.java → ...oss/driver/core/cql/BoundStatementIT.java b/...driver/api/core/cql/BoundStatementIT.java → ...oss/driver/core/cql/BoundStatementIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.cql;
+package com.datastax.oss.driver.core.cql;
 
 import static com.datastax.oss.simulacron.common.stubbing.PrimeDsl.noRows;
 import static com.datastax.oss.simulacron.common.stubbing.PrimeDsl.query;
@@ -29,6 +29,13 @@
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
 import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
+import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
+import com.datastax.oss.driver.api.core.cql.BoundStatement;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
+import com.datastax.oss.driver.api.core.cql.SimpleStatementBuilder;
 import com.datastax.oss.driver.api.core.metadata.token.Token;
 import com.datastax.oss.driver.api.core.type.codec.TypeCodecs;
 import com.datastax.oss.driver.api.testinfra.CassandraRequirement;
@@ -37,10 +44,10 @@
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.api.testinfra.simulacron.SimulacronRule;
 import com.datastax.oss.driver.categories.ParallelizableTests;
+import com.datastax.oss.driver.core.type.codec.CqlIntToStringCodec;
 import com.datastax.oss.driver.internal.core.DefaultProtocolFeature;
 import com.datastax.oss.driver.internal.core.ProtocolVersionRegistry;
 import com.datastax.oss.driver.internal.core.context.InternalDriverContext;
-import com.datastax.oss.driver.internal.core.type.codec.CqlIntToStringCodec;
 import com.datastax.oss.driver.internal.core.util.RoutingKey;
 import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;

diff --git a/...api/core/cql/ExecutionInfoWarningsIT.java → ...ver/core/cql/ExecutionInfoWarningsIT.java b/...api/core/cql/ExecutionInfoWarningsIT.java → ...ver/core/cql/ExecutionInfoWarningsIT.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.datastax.oss.driver.api.core.cql;
+package com.datastax.oss.driver.core.cql;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.timeout;
@@ -26,6 +26,10 @@
 import ch.qos.logback.core.Appender;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
+import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
+import com.datastax.oss.driver.api.core.cql.Statement;
 import com.datastax.oss.driver.api.testinfra.CassandraRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;

diff --git a/...core/cql/PagingIterableSpliteratorIT.java → ...core/cql/PagingIterableSpliteratorIT.java b/...core/cql/PagingIterableSpliteratorIT.java → ...core/cql/PagingIterableSpliteratorIT.java
@@ -13,13 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.cql;
+package com.datastax.oss.driver.core.cql;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
+import com.datastax.oss.driver.api.core.cql.BatchStatement;
+import com.datastax.oss.driver.api.core.cql.BatchStatementBuilder;
+import com.datastax.oss.driver.api.core.cql.DefaultBatchType;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
 import com.datastax.oss.driver.categories.ParallelizableTests;

diff --git a/...er/api/core/cql/PerRequestKeyspaceIT.java → ...driver/core/cql/PerRequestKeyspaceIT.java b/...er/api/core/cql/PerRequestKeyspaceIT.java → ...driver/core/cql/PerRequestKeyspaceIT.java
@@ -13,13 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.cql;
+package com.datastax.oss.driver.core.cql;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.api.core.cql.BatchStatement;
+import com.datastax.oss.driver.api.core.cql.DefaultBatchType;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
+import com.datastax.oss.driver.api.core.cql.Statement;
 import com.datastax.oss.driver.api.testinfra.CassandraRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;

diff --git a/...ver/api/core/cql/PreparedStatementIT.java → .../driver/core/cql/PreparedStatementIT.java b/...ver/api/core/cql/PreparedStatementIT.java → .../driver/core/cql/PreparedStatementIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.cql;
+package com.datastax.oss.driver.core.cql;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -23,6 +23,13 @@
 import com.datastax.oss.driver.api.core.DefaultProtocolVersion;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
+import com.datastax.oss.driver.api.core.cql.BoundStatement;
+import com.datastax.oss.driver.api.core.cql.ColumnDefinitions;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.metrics.DefaultSessionMetric;
 import com.datastax.oss.driver.api.core.servererrors.InvalidQueryException;
 import com.datastax.oss.driver.api.core.type.DataTypes;

diff --git a/...oss/driver/api/core/cql/QueryTraceIT.java → ...tax/oss/driver/core/cql/QueryTraceIT.java b/...oss/driver/api/core/cql/QueryTraceIT.java → ...tax/oss/driver/core/cql/QueryTraceIT.java
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.oss.driver.api.core.cql;
+package com.datastax.oss.driver.core.cql;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
+import com.datastax.oss.driver.api.core.cql.QueryTrace;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.metadata.EndPoint;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;